commit db40984debfc768a09e6974b10ae4e7caba45023
author Jenkins <jenkins@ring-packaging.cx> Thu Jul 13 14:44:55 2017 -0400
committer Jenkins <jenkins@ring-packaging.cx> Thu Jul 13 14:44:55 2017 -0400
tree d3b3b68259e09b98f231f66be57ddd1401e2448f
parent 61200f497df54f3662024b887850e3aa301d7c46

i18n: automatic bump

Change-Id: I5ce22de2417369ab1ec1799b0cc56fee3e542d30

RingWinClient.pro

diff --git a/RingWinClient.pro b/RingWinClient.pro
index 8daf746..15fae25 100644
--- a/RingWinClient.pro
+++ b/RingWinClient.pro
@@ -167,45 +167,53 @@
 RC_FILE = ico.rc
 
 TRANSLATIONS = \
+    translations/ring_client_windows_nb.ts \
     translations/ring_client_windows_pa.ts \
+    translations/ring_client_windows_pt_BR.ts \
     translations/ring_client_windows_pt.ts \
-    translations/ring_client_windows_sv.ts \
-    translations/ring_client_windows_ar.ts \
+    translations/ring_client_windows_ms.ts \
+    translations/ring_client_windows_de.ts \
+    translations/ring_client_windows_uk.ts \
+    translations/ring_client_windows_sq_AL.ts \
+    translations/ring_client_windows_ca.ts \
+    translations/ring_client_windows_es.ts \
+    translations/ring_client_windows_da_DK.ts \
+    translations/ring_client_windows_et_EE.ts \
+    translations/ring_client_windows_de_DE.ts \
     translations/ring_client_windows_lt.ts \
     translations/ring_client_windows_fr_FR.ts \
-    translations/ring_client_windows_hr.ts \
-    translations/ring_client_windows_nb.ts \
-    translations/ring_client_windows_hu.ts \
-    translations/ring_client_windows_zh.ts \
-    translations/ring_client_windows_fr.ts \
-    translations/ring_client_windows_fr_CA.ts \
-    translations/ring_client_windows_nl.ts \
-    translations/ring_client_windows_cs_CZ.ts \
-    translations/ring_client_windows_pt_BR.ts \
-    translations/ring_client_windows_id.ts \
-    translations/ring_client_windows_el.ts \
+    translations/ring_client_windows_he.ts \
+    translations/ring_client_windows_sk_SK.ts \
     translations/ring_client_windows_pl.ts \
-    translations/ring_client_windows_pl_PL.ts \
-    translations/ring_client_windows_da_DK.ts \
-    translations/ring_client_windows_fi.ts \
-    translations/ring_client_windows_it.ts \
+    translations/ring_client_windows_nl.ts \
     translations/ring_client_windows_it_IT.ts \
-    translations/ring_client_windows_de.ts \
-    translations/ring_client_windows_de_DE.ts \
+    translations/ring_client_windows_bg.ts \
+    translations/ring_client_windows_id.ts \
+    translations/ring_client_windows_en_GB.ts \
+    translations/ring_client_windows_pl_PL.ts \
     translations/ring_client_windows.ts \
     translations/ring_client_windows_eo.ts \
-    translations/ring_client_windows_uk.ts \
     translations/ring_client_windows_nl_NL.ts \
-    translations/ring_client_windows_fa_IR.ts \
-    translations/ring_client_windows_es.ts \
-    translations/ring_client_windows_bg.ts \
-    translations/ring_client_windows_tr.ts \
-    translations/ring_client_windows_ca.ts \
     translations/ring_client_windows_ru_RU.ts \
-    translations/ring_client_windows_ru.ts \
+    translations/ring_client_windows_hr.ts \
     translations/ring_client_windows_zh_CN.ts \
+    translations/ring_client_windows_fr.ts \
+    translations/ring_client_windows_tr.ts \
+    translations/ring_client_windows_cs_CZ.ts \
     translations/ring_client_windows_zh_TW.ts \
-    translations/ring_client_windows_he.ts \
+    translations/ring_client_windows_fr_CA.ts \
+    translations/ring_client_windows_zh.ts \
+    translations/ring_client_windows_fa_IR.ts \
+    translations/ring_client_windows_fi.ts \
+    translations/ring_client_windows_sv.ts \
+    translations/ring_client_windows_it.ts \
+    translations/ring_client_windows_el.ts \
+    translations/ring_client_windows_ja.ts \
+    translations/ring_client_windows_hu.ts \
+    translations/ring_client_windows_hi_IN.ts \
+    translations/ring_client_windows_ro.ts \
+    translations/ring_client_windows_ru.ts \
+    translations/ring_client_windows_ar.ts \
 
 maketranslationdir.target = customtarget
 maketranslationdir.commands = $(MKDIR) $$OUT_PWD/share/ring/translations/

translations/ring_client_windows.ts

diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index 24f1aaa..91d48e8 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!DOCTYPE TS>
-<TS version="2.1">
+<TS version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -15,38 +15,33 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"></translation>
     </message>
@@ -54,321 +49,396 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <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>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
@@ -386,170 +456,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"></translation>
@@ -603,6 +685,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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>
@@ -633,62 +720,62 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"></translation>
     </message>
@@ -698,17 +785,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"></translation>
     </message>
@@ -724,14 +811,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -765,6 +844,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <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>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -795,17 +953,17 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
@@ -884,6 +1042,12 @@
         <source>No default mail client found</source>
         <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>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
@@ -894,6 +1058,29 @@
     </message>
 </context>
 <context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <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>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
     <name>VideoOverlay</name>
     <message>
         <location filename="../videooverlay.ui" line="42"/>
@@ -936,22 +1123,22 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
@@ -969,17 +1156,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="233"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="236"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="243"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -987,23 +1174,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:&apos;Ubuntu&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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 5bf822a..052cb79 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ar" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>الأطراف المصممة</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>وسيط Microsoft Windows إلى Ring
 Ring برمجية تواصل مؤمنة و موزعة.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>الإصدار</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>أحدثه:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>مصمم العمل الفني:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>يستند على مشروع SFLPhone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>إعدادات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>عام</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>حساب</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>النوع</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>الاسم المستعار</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>المعلمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>اسم المضيف</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>اسم المستخدم</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>كلمة السر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>حذف الحساب</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>الوكيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>رقم البريد الصوتي</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>رد ألي على المكالمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>تفعيل UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>نوع النغمة DTMF</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>إسمح لأشخاص  مجهولة بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>إسمح للأشخاص في قائمة الإتصالات المعروفة بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>إسمح  للأشخاص  في تاريخ  المكالمات  بالإتصال</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>إعدادات الحساب Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>تشغيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>صوت/فيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>مرمّزات الصوت</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>مرمّزات الفيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>إعدادات متقدمة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>التسجيل</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>إنقضاء فترة التسجيل (ثواني):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>واجهة الشبكة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>نقطة عبور ( port ) محلية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>مثل المعلمات المحلية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>وضع العنوان و نقطة العبور المنشورة</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>العنوان</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>نقطة عبور ( port )</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>إستعمل STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>عنوان خادم التطبيق</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>إستعمل TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>حقل ( realm )</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>جلسة تفاوض SDP (حل تعويض ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>نطاق المنفذ RTP الصوتي</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>الحد الأدنى</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>الحد الاقصى</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>نطاق المنفذ RTP فيديو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>تأمين</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>ألغِ</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>موافق</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>تشفير تيار الميديا (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>تشفير التفاوض</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>العنوان المنشور</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>تشفير التفاوض (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>شهادة CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>شهادة المستخدم</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>المفتاح الخاص</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>كلمة سر المفتاح الخاص</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>تحقق من الشهادات الواردة (من جانب الخادم)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>تحقق من الشهادات الواردة (من جانب الزبون)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>استلزم شهادة للإتصالات TLS الواردة</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>إستعمل قائمة الشيفرة المبدئية</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>إيقاف مؤقت</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>إختار ملف</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>وثائق (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>الحوار</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>أو أكتب رقما</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>استمارة</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>محادثات</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>قائمة الإعدادات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring برنامج إتصال صوتي بصري وكتابي منيع وموزع لا يستلزم خادم مركزي ويمنح المستخدم كامل القدرة على التحكم في الخصوصية.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;هذا هو عنوان RingID الخاص بك.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;انسخه وشاركه مع أصدقائك&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>شارك عنوان Ring الخاص بك</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;نقر مزدوج للنسخ&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>خطأ عند محاولة تولد الرمز الشريطي</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>محادثة مع</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>ابدأ المحادثة !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>يريد التحدث إليك!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>أجب</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>تجاهل</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>يتّصل</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>مكالمة</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>نسخ الرقم</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>أضف إلى الاتصال</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>مشاركة بواسطة البريد الإلكتروني</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>إنسخ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>عرض التاريخ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>عرض المؤلف</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>لا يوجد حساب Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>محادثة مع %1</translation>
@@ -618,6 +684,11 @@
         <translation>أبقي مصغر عند الغلق</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>فيديو</translation>
@@ -648,62 +719,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>البحث عن تحديثات تلقائيًا كل</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>أيام</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>البحث عن تحديثات</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>المعاينة غير متوفرة أثناء المكالمة</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>إختيارات الأجهزة</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>جهاز</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>دقة العرض (resolution)</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>جهاز الإخراج</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>جهاز الإدخال</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>إضافة حساب جديد</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>استيراد</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>تصدير</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>حساب</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>إطلق Ring عند بدء التشغيل</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>حساب جديد</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>هل أنت متأكد من حذف تاريخك  ؟</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;طرق إتصال متعددة&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>اقبل</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>استمارة</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>ألغِ</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>موافق</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>ترتيب</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>غادر</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>عن RING</translation>
     </message>
@@ -899,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>الحوار</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>آلي</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>استمارة</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -969,22 +1122,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>أضف إلى الاتصال</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>تقاسم كل الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>تقاسم منطقة من الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>تقاسم الوثيقة</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>الرجاء الإنتظار في حين نحدث حسابك</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>مجهول</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>اختار اسم المستخدم</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>اختر اسم مستخدمك</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>كلمة السر</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>إحداث حسابك Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 079f97b..45a8395 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="bg" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Заслуги</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Издание: Луи-Жозеф Папино</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Клиентът на Ring за Уиндоус.
 Ring е сигурен и разпределен софтуер за общуване.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Ring за Уиндоус</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>версия</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Създаден от:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>С изображения от:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Основан на проекта „SFLPhone“</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Общи</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Акаунт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Вид</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Параметри</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Име на сървъра</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Потребителско име</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Парола</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>изтриване на акаунта</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Номер на гласова поща</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Авт. отговор на обажданията</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Вид на тоналното набиране:</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Позволяване на обажданията от непознати</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Позволяване на обажданията от контакти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Позволяване на обажданията от хора в историята</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Настройки на акаунта за Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Избор на тон за звънене</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Пускане</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Звук/видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Аудио кодеци</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Видео кодеци</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Разширени</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Годност на регистрацията (секунди):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Мрежова карта</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Местен порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
-        <translation type="unfinished"/>
+        <translation>Използване на местните параметри</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Задаване на публикувания адрес и порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Използване на STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Адрес на сървъра</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Използване на TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation>Област</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Сигурност</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Устройства</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Добавяне на устройство</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Отказ</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>Добре</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Шифроване на договарянето</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Публикуван адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Шифроване на договарянето (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <translation>CA сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Потребителски сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Частен ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Парола за частен ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Проверка на входящите сертификати (от страната на сървъра)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Проверка на отговарящите сертификатите (от страната на клиента)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Изискване на сертификат за входящите връзки чрез TLS</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Използване на шифри по подразбиране</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Изберете файл</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Всички файлове (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>От</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Прозорец</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>или въведете номер…</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Потърсете контакти или въведете ид. за Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Разговори</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>меню за настройки</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring е сигурна и разпределена система за гласово, видео и текстово общуване, която не изисква централен сървър и оставя поверителността в ръцете на потребителите.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Това е Вашият идентификатор за Ring.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Копирайте го и го изпратете на приятелите си!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Споделете своя идентификатор за Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Щракнете два пъти за копиране.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Грешка при създаването на QR-код</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Разговор с </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Начало на разговора!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>изпращане на съобщение</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Желае да говори с Вас!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Отговор</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Игнориране</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Обаждане</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Обаждане</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Копиране на номера</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Добавяне към контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Споделяне по е-поща</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Свържете се с мен в Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Моят ид. за Ring е:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Показване на QR-кода</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Копиране</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Показване на датата</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Показване на автора</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Входящо съобщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Обаждане на номера</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Копиране на номера</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Копиране на %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Обаждане на %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>НЕ Е ОТКРИТ АКАУНТ ЗА RING</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Входящо повикване от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Разговор с %1</translation>
@@ -618,6 +684,11 @@
         <translation>Минимизиране при затваряне</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Видео</translation>
@@ -648,62 +719,62 @@
         <translation>Постоянно записване</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Проверка за обновления на всеки</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>дни</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Проверка за обновления</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Прегледът не е възможен по време на разговор</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Избор на устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Разделителна способност</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Изходящо устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Входящо устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>добавяне на нов акаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Внасяне</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Изнасяне</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Акаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Пускане на Ring със системата</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Нов акаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Наистина ли искате да изчистите цялата история?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>От</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Приемане</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>От</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Отказ</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Добре</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Настройка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Изход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Относно</translation>
     </message>
@@ -899,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation>Не е открит клиент за е-поща по подразбиране</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Акаунт</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Прозорец</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Авт.</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
+        <translation>От</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -969,22 +1122,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>Етикет за името</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Добавяне към контакт</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Изминало време</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Споделяне на целия екран</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Споделяне на област от екрана</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Споделяне на файл</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Моля, изчакайте докато създадем акаунта Ви.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Свързване на това устройство с акаунт</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Изберете потребителското си име:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Изберете потребителско име</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Парола</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Потвърдете паролата</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Създаване на Вашия акаунт в Ring…</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Предишен</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 f72700e..73bc027 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ca" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Opcions</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tipus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Àlies</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Nom d&apos;amfitrió</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nom d&apos;usuari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Contrasenya</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Intermediari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Nombre de correu de veu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Autorespondre trucades</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP habitlitat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>Reproduir</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avançat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Temps d&apos;expiració del registre (segons):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Igual que els paràmetres locals</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Establir port i adreça públics:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adreça</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Utilitza STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Utilitza TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Mín</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Màx</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Seguretat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Negociació de xifrat (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Certificat CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Certificat d&apos;usuari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Clau privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Contrasenya de la clau privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Verifica certificats entrats (servidor)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Verifica certificats entrats (client)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Exigeix certificat per a les conexions TLS entrants</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Utilitza xifrats per defecte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Converses</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring és una plataforma de veu, vídeo i xat segura i distribuïda que no requereix un servidor central i deixa en mans de l&apos;usuari el poder de la privacitat.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Trucada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>Copia el número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Vídeo</translation>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -712,17 +783,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Compte Nou</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -806,20 +948,20 @@
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Ring</source>
-        <translation type="unfinished"/>
+        <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Compartir pantalla</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Compartir arxiu</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>Desconegut</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Contrasenya</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Generant el vostre compte de Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 600f352..ed5d5f8 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="cs_CZ" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Zásluhy</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Vydání : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Klient Microsoft Windows pro Ring.
 Ring je bezpečný a distribuovaný komunikační program.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>verze</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Vytvořili:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Grafika:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Postaveno na projektu SFLPhone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Obecné</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Přezdívka</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametry</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
-        <translation>Hostitelské jméno</translation>
+        <translation>Název serveru</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Heslo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>odstranit účet</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Číslo hlasové schránky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Automaticky přijímat hovory</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP povoleno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Druh tónové volby</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Povolit hovory od neznámých</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Povolit hovory od kontaktů</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Povolit hovory z Historie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Adresa jmenné služby</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
-        <translation>Nastavení účtu Ring</translation>
+        <translation>Nastavení účtu Ringu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
-        <translation>Výběr Vyzvánění</translation>
+        <translation>Výběr vyzváněcí melodie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
-        <translation>Obraz/Zvuk</translation>
+        <translation>Zvuk/Obraz</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Zvukové kodeky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Obrazové kodeky</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Pokročilé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registrace</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Vypršení registrace (v sekundách):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Síťové rozhraní</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Místní port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Stejné jako místní parametry</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Zadat veřejnou adresu a port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Použít STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL serveru</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Použít TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Oblast</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Vyjednávání sezení SDP (ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Rozsah portů pro zvuk RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Rozsah portů pro obraz RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Zabezpečení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
-        <translation>Šifrování Datového Toku (SRTP)</translation>
+        <translation>Šifrování datového toku (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Zařízení</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Přidat zařízení</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Exportovat na Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Váš vygenerovaný PIN:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Šifrovat datový tok (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Šifrování vyjednávání</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
-        <translation>Zveřejněná Adresa</translation>
+        <translation>Zveřejněná adresa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Šifrovat vyjednávání (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA certifikát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Uživatelský certifikát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Soukromý klíč</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Heslo soukromého klíče</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Ověřit příchozí certifikáty (na straně serveru)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Ověřit příchozí certifikáty (na straně klienta)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Vyžadovat certifikát pro příchozí TLS spojení</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Použít výchozí šifry</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pozastavit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Vyberte soubor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Soubory (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Špatné heslo</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulář</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>nebo vložte číslo...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Hledejte kontakty nebo zadejte Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Konverzace</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Žádosti o kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
-        <translation>menu nastavení</translation>
+        <translation>nabídka nastavení</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring je bezpečná a distribuovaná platforma pro zvukovou, obrazovou a textovou komunikaci, která nevyžaduje žádný centrální server a ponechává kontrolu nad soukromím v rukou uživatele.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Toto je vaše RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Sdílejte jej s vašimi přáteli!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Sdílet vaše Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Klikněte dvakrát pro zkopírování.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
-        <translation>Chyba při generaci QR Kódu</translation>
+        <translation>Chyba při vytváření QR kódu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Konverzace s</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Začněte konverzaci !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>odeslat zprávu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
-        <source>Wants to talk to you!</source>
-        <translation>S vámi chce hovořit!</translation>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation>Chce s vámi hovořit!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Přijmout</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation>Ignorovat</translation>
+        <translation>Přehlížet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Volání</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
-        <translation>Call</translation>
+        <translation>Volat</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Zkopírovat číslo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Přidat do kontaktů</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Sdílet e-mailem</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation>Kontaktujte mě přes Ring</translation>
+        <translation>Spojte se se mnou přes Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mé Ring ID je :</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Ukázat QR Kód</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Zkopírovat</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Zobrazit datum</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Zobrazit autora</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Příchozí zpráva od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Kopírovat název</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
-        <translation>Volat Číslo</translation>
+        <translation>Volat číslo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
-        <translation>Kopírovat Číslo</translation>
+        <translation>Kopírovat číslo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopírovat %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Volat %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>ŽÁDNÝ ÚČET RING NENALEZEN</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Příchozí hovor od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Konverzace s %1</translation>
@@ -585,7 +651,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="171"/>
         <source>quit settings menu</source>
-        <translation>ukončit menu nastavení</translation>
+        <translation>ukončit nabídku nastavení</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="331"/>
@@ -618,6 +684,11 @@
         <translation>Neukončovat Ring po uzavření okna</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Obraz</translation>
@@ -635,7 +706,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="506"/>
         <source>Record Settings</source>
-        <translation>Nastavení Nahrávání</translation>
+        <translation>Nastavení nahrávání</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="539"/>
@@ -645,65 +716,65 @@
     <message>
         <location filename="../configurationwidget.ui" line="582"/>
         <source>Always Record</source>
-        <translation>Vždy Nahrávat</translation>
+        <translation>Vždy nahrávat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Kontrolovat aktualizace každých</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dní</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Zkontrolovat aktualizace</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Náhled během hovoru nedostupný</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
-        <translation>Výběr Zařízení</translation>
+        <translation>Výběr zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Rozlišení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation>Výstupní Zařízení</translation>
+        <translation>Výstupní zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation>Vstupní Zařízení</translation>
+        <translation>Vstupní zařízení</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>přidat nový účet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importovat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exportovat</translation>
     </message>
@@ -713,37 +784,29 @@
         <translation>Účet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <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="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nový účet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation>Opravdu chcete vymazav všechnu svou historii?</translation>
+        <translation>Opravdu chcete vymazat všechnu svou historii?</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
         <source>Choose Directory</source>
-        <translation>Vyberte Adresář</translation>
+        <translation>Vyberte adresář</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="409"/>
         <source>An error occured while importing account.</source>
-        <translation>Chyba při importu účtu.</translation>
-    </message>
-</context>
-<context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Multiple contact methods&gt;</translation>
+        <translation>Chyba při zavádění účtu.</translation>
     </message>
 </context>
 <context>
@@ -771,7 +834,7 @@
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation>Sem vložte jméno...</translation>
+        <translation>Zde vložte jméno...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulář</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Přijmout</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blokovat</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formulář</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Zrušit</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Odejít</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
@@ -840,7 +982,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation>Ok</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
@@ -850,7 +992,7 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation>Uložit Soubor</translation>
+        <translation>Uložit soubor</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="62"/>
@@ -861,7 +1003,7 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation>Otevřít Soubor</translation>
+        <translation>Otevřít soubor</translation>
     </message>
 </context>
 <context>
@@ -884,7 +1026,7 @@
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
         <source>Choose File</source>
-        <translation>Vyberte soubor</translation>
+        <translation>Vybrat soubor</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="61"/>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Nenalezen žádný výchozí e-mailový klient</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Účet Ring</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Automaticky</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
-        <translation>Form</translation>
+        <translation>Formulář</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -936,12 +1089,12 @@
     <message>
         <location filename="../videooverlay.ui" line="119"/>
         <source>Hold / Unhold</source>
-        <translation>Pozastavit / Pokračovat</translation>
+        <translation>Pozastavit/Pokračovat</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="154"/>
         <source>Chat</source>
-        <translation>Chat</translation>
+        <translation>Rozhovor</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="186"/>
@@ -956,35 +1109,35 @@
     <message>
         <location filename="../videooverlay.ui" line="256"/>
         <source>Mute Mic</source>
-        <translation>Ztlumit Mikrofon</translation>
+        <translation>Ztlumit mikrofon</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="367"/>
         <source>Quality</source>
-        <translation>Kvalita</translation>
+        <translation>Jakost</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="399"/>
         <source>Join Calls</source>
-        <translation>Spojit Hovory</translation>
+        <translation>Spojit hovory</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Jmenný štítek</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Přidat do kontaktů</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Uplynulý čas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Sdílet celou obrazovku</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Sdílet část obrazovky</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Sdílet soubor</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Prosím čekejte zatím co vytváříme váš účet.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Neznámý</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Připojit toto zařízení k účtu</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Vytvořit vlastní profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Vytvořit vlastní účet</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Zvolte si vaše uživatelské jméno:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Zvolte si uživatelské jméno</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Zaregistrovat jméno veřejně (experimentální)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Zadejte PIN</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Heslo</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Potvrdit heslo</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Vytváří se váš účet Ring…</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Předchozí</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 72fe2db..cc582f9 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="da_DK" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Krediteringer</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Udgivelse : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows klient til Ring.
 Ring er software til sikker og distribueret kommunikation.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>version</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Skabt af:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Grafik af:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Baseret på SFLPhone-projektet</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Generelt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Værtsnavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Kodeord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>slet konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Stedfortræder</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Telefonsvarernummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Svar automatisk opkald</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiveret</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>DTMF-tone type</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
-        <translation>Tillad Opkald Fra Ukendt</translation>
+        <translation>Tillad opkald fra ukendt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
-        <translation>Tillad Opkald Fra Kontakt</translation>
+        <translation>Tillad opkald fra kontakt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
-        <translation>Tillad Opkald Fra Historik</translation>
+        <translation>Tillad opkald fra historik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Navne-service URL</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ring-konto Indstillinger</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Ringetone-valg</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Afspil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Lyd/video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Audio-codec&apos;er</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Video-codec&apos;er</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avanceret</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registrering</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tidsgrænse for registrering (sekunder):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Netværksinterface</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Lokal-port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Samme som lokale parametre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Sæt offentliggjorte adresse og port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Brug STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Server-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Brug TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Realm</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP Sessions-forhandling (ICE-tilbagefald)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Portinterval for Lyd-RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Maks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP-port Interval</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sikkerhed</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediestrøm kryptering (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Enheder</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Tilføj enhed</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Eksporter til Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Din genererede PIN-kode:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Kryptér mediastrøm (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Forhandlingskryptering</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Publiceret Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Krypter forhandling (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA-certifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Bruger-certifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privat nøgle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Kodeord til privat nøgle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Verificer indgående certifikater (på server-siden)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Verificer svar-certifikater (på klient-siden)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Kræv certifikat for indgående TLS-forbindelser</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Brug standard-cifre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Forkert kodeord.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>eller angiv nummer...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Søg kontakter eller angiv Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Samtaler</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Kontaktforespørgsler</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>indstillinger</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring er en sikker og distribueret tale, video og besked kommunikationsplatform, der ikke benytter en central server og som efterlader magten over privatlivet i brugerens hænder.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Dette er dit RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kopiér og del det med dine venner!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Del din Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Dobbel-klik for at kopiér.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Fejl ved generering af QR code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Samtale med</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Start samtalen!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>send besked</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Vil tale med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Besvar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Ringer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Ring op</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Kopier nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Føj til kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Del via email</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Kontakt mig på Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Min Ring-ID er:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Vis QR kode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopiér</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Vis dato</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Vis forfatter</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Besked ankommet fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Kopiér navn</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Ring til nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Kopiér nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopiér %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Ring %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>INGEN RING KONTO FUNDET</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Indgående kald fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Samtale med %1</translation>
@@ -618,6 +684,11 @@
         <translation>Hold minimeret ved lukning</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -648,62 +719,62 @@
         <translation>Optag altid</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Søg efter opdateringer automatisk hver</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Søg efter opdateringer</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Forhåndsvisning ikke tilgængelig under samtale</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Enheds-valg</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Enhed</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Opløsning</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Output Enhed</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Input Enhed</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>tilføj ny konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Eksport</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Start Ring ved opstart</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Ny konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <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>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Flere kontakt metoder&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Accepter</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blokér</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Annuller</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Ingen standard mail klient fundet</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring-konto</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>TekstLabel</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Sammenføj samtaler</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Navne etiket</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Føj til kontakt</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Tid gået</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Del hele skærmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Del skærmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Vent venligst men vi opretter din konto.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Ukendt</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Tilknyt denne enhed til en konto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Opret din profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Opret din konto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Vælg dit brugernavn:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Vælg dit brugernavn</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Registrer offentligt brugernavn (eksperimentel funktionalitet)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Kodeord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Bekræft kodeord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Genererer din Ring-konto...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Tilbage</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 aefa87a..36eb305 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Würdigung</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Release : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Die Microsoft Windows Oberfläche für Ring.
 Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Erstellt von:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Visuelle Gestaltung:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Basierend auf dem SFLPhone-Projekt</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Aliasname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Rechnername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Passwort</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>Konto löschen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Nummer für Sprachnachrichten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Anrufe automatisch beantworten</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiviert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>DTMF Tontyp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Anruf von Unbekannt erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Anruf von Kontakt erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Anruf von Verlauf erlauben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
-        <source>Ring Account Settings</source>
-        <translation>Ringkonto Einstellungen</translation>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>URL des Namensservers</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation>Ring-Kontoeinstellungen</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Klingelton wählen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Audio Codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Video Codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registrierung</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Registrierungsverfallzeitüberschreitung (Sekunden):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Netzwerkschnittstelle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Lokaler Port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Identisch zu den lokalen Parametern</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Veröffentlichte Adresse und Port setzen:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>STUN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Server URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Turn benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Bereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP Sitzungsverhandlung (ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation>Diese Einstellungen werden nur benutzt während einer SDP Sitzungsverhandlung, im Falle das ICE ist vom Server oder vom Teilnehmer nicht unterstützt wird.</translation>
+        <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Audio RTP Portbereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP Portbereich</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Media Stream Encryption (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Geräte</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Gerät hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Zu Ring exportieren</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Ihre generierte PIN:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Medienströme verschlüsseln (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Verhandlungsverschlüsselung</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Veröffentlichte Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Verhandlung verschlüsseln (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
-        <translation>CA Zertifikat</translation>
+        <translation>CA-Zertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Benutzerzertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privater Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Passwort für den privaten Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Eingehende Zertifikate überprüfen (serverseitig)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Antwortzertifikate überprüfen (clientseitig)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Ein Zertifikat für eingehende TLS-Verbindungen fordern</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Standardcipher verwenden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>Ring-ID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Dateien (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Falsches Passwort.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>oder Nummer eingeben...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Kontakte suchen oder Nummer eingeben</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Unterhaltungen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Kontaktanfragen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring ist eine sichere und verteile Kommunikationsplattform für Sprach-, Video- und Textnachrichten, die keine zentralen Server benötigt und die Kontrolle der Privatsphäre in der Hand des Benutzers lässt.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Ihre Ring-ID&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kopieren und mit Freunden teilen!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Ring-ID teilen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Doppelklick um in Zwischenanlage zu kopieren.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Fehler bei der Erstellung des QR-Codes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Unterhaltung mit</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Unterhaltung starten!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>Nachricht senden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Möchte mit dir Sprechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Rufaufbau</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Anruf</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Kontakt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Per Mail teilen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Kontaktieren Sie mich über Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Meine RingId ist:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>QR-Code anzeigen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Anzeigedatum</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Anzeigeauthor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Eingehende Nachricht von %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Name kopieren</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Nummer anrufen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopiere %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>%1 anrufen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>KEIN RING KONTO GEFUNDEN</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Eingehender Anruf von %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Unterhaltung mit %1</translation>
@@ -618,6 +684,11 @@
         <translation>Beim Schließen minimiert bleiben</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -635,7 +706,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="506"/>
         <source>Record Settings</source>
-        <translation>Aufnahme Einstellungen</translation>
+        <translation>Aufnahme-Einstellungen</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="539"/>
@@ -648,62 +719,62 @@
         <translation>Immer aufnehmen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Automatisch auf Aktualisierungen prüfen. Alle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Auf Aktualisierungen prüfen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Vorschau während Anruf nicht verfügbar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Geräteauswahl</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Auflösung</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Ausgabegerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Aufnahmegerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>Neues Konto hinzufühgen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Import</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Export</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Ring beim Hochfahren starten</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Neues Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <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>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Mehrere Kontaktarten&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Akzeptieren</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Sperren</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formular</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Kein Standardprogramm für E‑Mail gefunden</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring-Konto</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Automatisch</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formular</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>Textlabel</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Anruf beitreten</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Namenslabel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Kontakt hinzufügen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Zeit vergangen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Gesamten Bildschirm teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Bildschirmbereich teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Datei teilen</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Bitte warten sie während ihr Konto erstellt wird</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <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="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Erstellen Sie Ihr Profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Legen Sie ein Benutzerkonto an</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Nutzernamen wählen:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Nutzername wählen</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <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="425"/>
+        <source>Enter your pin</source>
+        <translation>Geben Sie Ihre PIN ein</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Passwort bestätigen</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Ihr Ring-Konto wird generiert...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Vorherige</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 1e82a87..4edaf82 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="de_DE" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation>Abspann</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>Version</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,331 +47,401 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Allgemein</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parameter</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>
     Passwort</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Voicemail-Rufnummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiviert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Wiedergeben</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Erweitert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Netzwerkschnittstelle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>TURN benutzen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sicherheit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Abbrechen</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>Okay</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privater Schlüssel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Antwort</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Rufen an</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Anrufen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -618,6 +684,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -648,62 +719,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>Tage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Gerät</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exportieren</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Abbrechen</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
@@ -900,30 +1042,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -970,22 +1123,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1003,17 +1156,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1021,23 +1174,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Unbekannt</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Passwort</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Konto bestätigen</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 71d2769..604b18f 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -1,50 +1,45 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="el" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>Περί</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
         <source>Credits</source>
+        <translation>Μονάδες</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation>έκδοση</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Γενικά</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Λογαριασμός</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Τύπος</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Ψευδώνυμο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Παράμετροι</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Όνομα χρήστη</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Σύνθημα</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Διαμεσολαβητής</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Αριθμός Voicemail</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Αυτόματη απάντηση κλήσεων</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP ενεργοποίηση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>URL υπηρεσίας ονομάτων</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Αναπαραγωγή</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Ήχος/Βίντεο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Για προχωρημένους</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Εγγραφή</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Χρονική λήξη καταχώρησης (δευτερόλεπτα):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Διεπαφή δικτύου</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Τα ίδια ως τοπικοί παράμετροι</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Καθορισμός δημοσιευμένης διεύθυνσης και θύρας:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Διεύθυνση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Χρήση STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Χρήση TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Διαπραγμάτευση συνεδρίας SDP (εφεδρικό του ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Εύρος θυρών RTP ήχου</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Ελάχιστο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Μέγιστο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Εύρος θυρών RTP βίντεο</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Ασφάλεια</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Συσκευές</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Προσθήκη συσκευής</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Ακύρωση</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Εξαγωγή στο Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Το δημιουργημένο σας PIN:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Κρυπτογράφηση διαπραγμάτευσης</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Δημοσιευμένη διεύθυνση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Κρυπτογράφηση διαπραγμάτευσης (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Πιστοποιητικό CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Πιστοποιητικό χρήστη</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Ιδιωτικό κλειδί</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Συνθηματικό ιδιωτικού κλειδιού</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Επαλήθευση εισερχόμενων πιστοποιητικών (πλευρά διακομιστή)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Επαλήθευση πιστοποιητικών απάντησης (πλευρά πελάτη)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Απαίτηση πιστοποιητικού για εισερχόμενες συνδέσεις TLS</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Χρήση προκαθορισμένων αλγόριθμων κρυπτογράφησης</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Συνομιλίες</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Αιτήματα επαφών</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Το Ring είναι μια ασφαλής και κατανεμημένη πλατφόρμα επικοινωνίας για ήχο, βίντεο και κουβέντα, που δεν απαιτεί ένα κεντρικό διακομιστή και αφήνει την ισχύ της ιδιωτικότητας στα χέρια του χρήστη.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Καλεί</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Κλήση</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Αντιγραφή αριθμού </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>Αντιγραφή</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>Ημερομηνία εμφάνισης</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Βίντεο</translation>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation>Συσκευή</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Εισαγωγή</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Εξαγωγή</translation>
     </message>
@@ -712,17 +783,17 @@
         <translation>Λογαριασμός</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Νέος λογαριασμός</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -755,26 +818,105 @@
     <message>
         <location filename="../contactpicker.ui" line="43"/>
         <source>Search...</source>
-        <translation type="unfinished"/>
+        <translation>Αναζήτηση...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
         <source>Create new contact</source>
-        <translation type="unfinished"/>
+        <translation>Δημιουργία νέας επαφής</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="75"/>
         <source>New Contact</source>
-        <translation type="unfinished"/>
+        <translation>Νέα επαφή</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation type="unfinished"/>
+        <translation>Εισάγετε ένα όνομα εδώ...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
         <source>Create</source>
+        <translation>Δημιουργία</translation>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Ακύρωση</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -788,12 +930,12 @@
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>Αντιγραφή</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="52"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>Ημερομηνία εμφάνισης</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="56"/>
@@ -809,19 +951,19 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Ρυθμίσεις</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Έξοδος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>Περί</translation>
     </message>
 </context>
 <context>
@@ -849,7 +991,7 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation type="unfinished"/>
+        <translation>Αποθήκευση αρχείου</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="62"/>
@@ -860,7 +1002,7 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>Άνοιγμα αρχείου</translation>
     </message>
 </context>
 <context>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Μοίρασμα περιοχής της οθόνης</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Μοίρασμα αρχείου</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Άγνωστος</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Σύνδεση αυτής της συσκευής με ένα λογαριασμό</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Συνθηματικό</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Γίνεται δημιουργία του λογαριασμού σας Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Προηγούμενο</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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
new file mode 100644
index 0000000..3e0d9cf
--- /dev/null
+++ b/translations/ring_client_windows_en_GB.ts
@@ -0,0 +1,1323 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="en_GB" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <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"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>Play</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <source>Audio RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
+        <source>Min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <source>Search contacts or enter ring ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>Name</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

translations/ring_client_windows_eo.ts

diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index 1f6b8f0..e5df126 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="eo" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Kredito</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Eldono : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>La Microsoft Windows kliento por Ring.
 Ring estas sekura kaj disa komunikprogramo.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>versio</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Kreita de:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Grafiko de:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Surbaze de la SFLPhone projekto</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Agordoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Ĝenerala</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Kromnomo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametroj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Nomo de gastiga komputilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Uzantnomo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Pasvorto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>Forigi konton</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Prokura servilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Parolita mesaĝo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Aŭtomate respondi vokojn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP ŝaltita</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Tipo de du-tona multfrekvenco</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Permesi Vokojn de Nekonataj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Permesi Vokojn de Kontaktoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Permesi Vokojn de Historio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>URL de noma servo</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Agordoj de Ring Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Elekto de vokosono</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Ludi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Aŭdio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Sonkodekoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Videokodekoj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Speciala</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registriĝo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tempolimo de registriĝo (sekunde):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Reta Interfaco</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Loka Pordo:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Same kiel lokaj parametroj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Agordi publikan adreson kaj pordon:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adreso</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Pordo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Uzi STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL de servilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Uzi TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Regno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Intertraktado de SDP seanco (ICE retropaŝo)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Porda Amplekso de Aŭdia RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Maks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Porda Amplekso de Videa RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sekurigo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Aŭdvidflua ĉifrado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Aparatoj</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Aldoni aparaton</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Rezigni</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Elporti sur Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Via generita PIN:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>Okej</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Ĉifrado de Intertraktado</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Publikita Adreso</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Ĉifri intertraktadon (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA atestilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Uzanta atestilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privata ŝlosilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Pasvorto de privata ŝlosilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Kontroli enirantajn atestilojn (servilflanke)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Kontroli envenajn atestilojn (klientflanke)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Bezoni atestilon por enirantaj TLS konektoj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Uzi defaŭltajn ĉifrojn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Paŭzo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Elektu dosieron</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Dosieroj (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogo</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>aŭ tajpu numeron...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Serĉu kontaktojn aŭ entajpu Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Konversacioj</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>Menuo de agordoj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring estas sekura kaj disa voĉa, videa kaj retbabila komunika platformo kiu ne bezonas centran servilon kaj restigas la povon de privateco ĉe la uzanto.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Tio ĉi estas via RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kopiu kaj kunhavu ĝin kun viaj amikoj!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Kunhavu vian Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Eraro dum generado de QR Kodo</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Konversacio kun</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Komencu la konversacion !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>Sendi mesaĝon</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Volas paroli kun vi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Respondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Malatenti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Vokanta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Voki</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Kopii numeron</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Aldoni al kontakto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Kunhavu per retpoŝto</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Kontaktu min per Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mia RingID estas:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Montri QR Kodon</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopii</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Vidigi daton</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Vidigi aŭtoron</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Mesaĝo eniranta de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Voki Numeron</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Kopii Numeron</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopii %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Voki al %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>NENIU RING KONTO TROVITA</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Voko eniranta de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Konversacio kun %1</translation>
@@ -618,6 +684,11 @@
         <translation>Ne ĉesu pro fermado fenestron</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -648,62 +719,62 @@
         <translation>Ĉiam registri</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Aŭtomate kontroli ĝisdatigojn po</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>tagoj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Kontroli ĝisdatigojn</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Aspekto nehavebla dum voko</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Selekto de Aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Distingivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Eliga aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Eniga aparato</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>Aldoni novan konton</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Enporti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Elporti</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Lanĉi Ring Post Startigo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nova Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Ĉu vi certe volas vakigi vian tutan historion?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Multiple contact methods&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Akcepti</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Rezigni</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Okej</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Agordo</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Eliri</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Pri</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Neniu defaŭlta retpoŝta kliento trovita</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogo</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Aŭtomata</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Kunligi Vokojn</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Noma etikedo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Aldoni al kontakto</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Pasinta tempo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Kunhavigi tutan ekranon</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Kunhavigi areon de ekrano</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Kunhavigi dosieron</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Bonvole atendu dum ni kreas vian konton.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Nekonata</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Elektu vian uzantnomon:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Elektu vian uzantnomon</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Pasvorto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Konfirmu pasvorton</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Generanta vian Ring-an konton...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Antaŭa</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 f003f16..5f54618 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="es" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Créditos</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Lanzamiento : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation>Lanzamiento: Beta 2 - Gaston Miron</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>El cliente Ring para Microsoft Windows
 Ring es un programa de comunicación distribuido y seguro.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Ring para Windows</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>versión</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Creado por:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Diseñado por:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Basado en el proyecto SFLPhone</translation>
     </message>
@@ -53,333 +48,403 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>General</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Escribe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parámetros</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Nombre del host</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nombre de usuario</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Contraseña</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>borrar cuenta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Numero de Casilla de Mensaje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Respuesta automática de llamadas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP habilitado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Tipo de tono DTMF</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Permitir llamadas desconocidas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Permitir llamadas de Contactos</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Permitir llamada desde el Historial</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation>Usuario público</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation>Registrarse en blockchain</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>URL del servicio de nombres</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Configuración de la cuenta Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Selección de tono de llamada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Códecs de audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Códecs de video </translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avanzado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tiempo de espera de Registración (seg):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Interface de Red</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Puerto Local:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Igual que los parametros locales</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Configurar dirección publicada y puerto:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Dirección</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Puerto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Utilizar STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL del Servidor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Utilizar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Dominio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <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="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Rango de Puertos RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Mínimo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Máximo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Rango de Puertos RTP de Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Seguridad</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Cifrado del flujo audiovisual (SRPT)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Dispositivos</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Agregar dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation>Contraseña (obligatoria)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Exportar en Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>PIN generado:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Cifrado de negociación</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Dirección IP Publicada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Encriptar Negociación (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Certificado CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Certificado de usuario</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Clave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Contraseña de clave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Verificar certificados entrantes (lado del servidor)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Verificar certificados de respuesta (lado del cliente)	</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Exigir un certificado para las conexiones TLS entrantes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Usar cifrados por defecto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Examinar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Ficheros (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation>Espere mientras se genera su PIN.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation>Error de red. Por favor, inténtelo de nuevo más tarde.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Contraseña errónea</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation>Registrando... Puede tardar un poco de tiempo</translation>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation>ID bloqueado</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation>Desbloquear contacto, y añadirle a la lista de contactos</translation>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
-        <translation>o escriba el número...</translation>
+        <translation>o escribe el número...</translation>
     </message>
     <message>
         <location filename="../callutilsdialog.ui" line="104"/>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Formulario</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Buscar contacto o introducir número</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Conversaciones</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Solicitudes de contacto</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>Menú de configuraciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring es una plataforma de comunicación, video y chat seguro y distribuido que no requiere un servidor centralizado y deja el poder de la privacidad en manos del usuario</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Este es tu RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;¡Copialo y compartelo con tus amigos!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Este es tu RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;¡Cópialo y compártelo con tus amigos!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation>Compartir su ID de Ring</translation>
+        <translation>Compartir el ID de Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Doble clic para copiar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <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="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation>solicitud de contacto</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Conversación con</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>¡Comienza la conversación!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>enviar mensaje</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
-        <source>Wants to talk to you!</source>
-        <translation>Quiere charlar contigo!</translation>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation>¡Quiere charlar contigo!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Contestar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Llamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Llamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Copiar Número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Agregar a Contactos</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Compartir por e-mail</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Contactame por Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mi RingID es:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Mostrar código QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Mostrar día</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Mostrar autor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Recibido mensaje de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Copiar nombre</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Llamar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Copiar %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Marcar %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>No existe cuenta de RING</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Llamada entrante de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Conversación con %1</translation>
@@ -618,6 +684,11 @@
         <translation>Mantener minimizado al cerrar</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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>
@@ -648,62 +719,62 @@
         <translation>Grabar siempre</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation>Habilitar notificaciones</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Buscar actualizaciones automáticamente cada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Buscar actualizaciones</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Vista previa no disponible durante la llamada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Seleccionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Resolución</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Dispositivo de salida</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Dispositivo de entrada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>Aggregar cuenta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
@@ -713,19 +784,19 @@
         <translation>Cuenta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Iniciar Ring automáticamente</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nueva cuenta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation>¿Está seguro que quiere limpiar todo su historial?</translation>
+        <translation>¿Estás seguro de que quieres limpiar todo el historial?</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Múltiples métodos de contacto&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -771,7 +834,7 @@
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation>Introduzca un nombre...</translation>
+        <translation>Introduce un nombre...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation>Solicitud de Contacto Entrante</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation>nameLabel</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation>bestIdLabel</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Aceptar</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation>Descartar</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Bloquear</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formulario</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation>Ring - eliminar cuenta</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation>¿Realmente quieres eliminar la cuenta?</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation>Esta acción es irrevocable</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>Si esta cuenta no se ha exportado, ó agregada a otro dispositivo, se perderá</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Aceptar</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>No se encuentra el cliente de e-mail predeterminado</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Cuenta de Ring</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Mensaje</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulario</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>EtiquetaDeTexto</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation>ContactID</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation>TODO: Explique el propósito de una solicitud de contacto</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation>Enviar solicitud de contacto</translation>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Unirse a la llamada</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Etiqueta de nombre</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Agregar a Contactos</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Tiempo transcurrido</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Compartir toda la pantalla</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Compartir la ventana</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Compartir archivo</translation>
     </message>
@@ -1020,23 +1173,163 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Por favor espere mientras creamos su cuenta</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation>Debe migrar su cuenta. Elije una contraseña.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation>Migrando su cuenta de Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Desconocido</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
-        <source>Choose your username:</source>
-        <translation>Eliga su nombre de usuario:</translation>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <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.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation>Añadir un dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation>Nombre de usuario no disponible.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation>Nombre de usuario disponible.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation>Nombre de usuario incorrecto.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation>Error de red.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation>Crear cuenta de Ring</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Conectar este dispositivo a una cuenta</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation>Cómo agregar un dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&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:&apos;Ubuntu&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-size:12pt;&quot;&gt;Para vincular este dispositivo a otra cuenta, primero &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;
+necesitas obtener un código PIN&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;. Para generar el código PIN: &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-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;Ir a &lt;span style=&quot; font-weight:600;&quot;&gt;Configuración de administración de cuentas&lt;/span&gt;de un dispositivo anterior&lt;/li&gt;
+&lt;li style=&quot; 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;Elegir la &lt;span style=&quot; font-weight:600;&quot;&gt; cuenta de Ring&lt;/span&gt; que quiera usar&lt;/li&gt;
+&lt;li style=&quot; 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;Ir a &lt;span style=&quot; font-weight:600;&quot;&gt; pestaña de &lt;/span&gt; dispositivos&lt;/li&gt;
+&lt;li style=&quot; 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;Seleccionar &lt;span style=&quot; font-weight:600;&quot;&gt;Añadir dispositivo&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-size:12pt;&quot;&gt;Usted recibirá el PIN necesario para completar este formulario. El PIN sólo es válido para &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;
+
+
+
+Para generar el código PIN: 961011Go a la configuración 12Account management12 de un dispositivo anterior1113Choose la cuenta 14Ring14 que desea usar1315Go a la 16Devices16 tab1517Seleccionar 18Agregar un dispositivo1817101920Va obtener el PIN necesario para completar este formulario. El PIN sólo es válido para 202110 minutos2122.221951 242</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Crea tu perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation>Introduzca su nombre completo:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Crea tu cuenta</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation>Elige tu nombre de usuario:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Elije un nombre de usuario para ti</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation>Buscando...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Registrar un nombre público (experimental)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Escribe tu PIN</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Contraseña</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Confirmar contraseña</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Generando tu cuenta Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Anterior</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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
new file mode 100644
index 0000000..59a89d8
--- /dev/null
+++ b/translations/ring_client_windows_et_EE.ts
@@ -0,0 +1,1323 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="et_EE" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <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"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>Mängi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <source>Audio RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
+        <source>Min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <source>Search contacts or enter ring ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation>vasta</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation>Helistab</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>Nimi</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

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 5d19446..085ea85 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -1,381 +1,447 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa_IR" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fa_IR" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>درباره</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
         <source>Credits</source>
+        <translation>دست‌اندرکاران</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>نسخه رینگ برای میکروسافت ویندوز
+رینگ یک نرم‌افزار ارتباطی امن و توزیع شده است.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation>نگارش</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
-        <translation type="unfinished"/>
+        <translation>ساخته‌شده توسط:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
-        <translation type="unfinished"/>
+        <translation>برمبنای پروژه SFLPhone</translation>
     </message>
 </context>
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>تنظیمات</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>همگانی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>حساب کاربری</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>نوع</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>مستعار</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation>پارامترها</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>نام هاست</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>نام کاربری</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>گذرواژه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>پراکسی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>شماره پست صوتی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>پاسخگویی خودکار تماس‌ها</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP فعال شد</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation>اجازه به مخاطبان برای تماس</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
-        <source>Ring Account Settings</source>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>نشانی اینترنتی خدمت نام</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation>تنظیمات حساب رینگ</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>ش</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation>صدا/تصویر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>پیشرفته</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation>ثبت نام</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation>رابط شبکه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
-        <translation type="unfinished"/>
+        <translation>درگاه محلی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
-        <translation type="unfinished"/>
+        <translation>همانند پارامتر‌های محلی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
-        <translation type="unfinished"/>
+        <translation>نشانی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>درگاه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
-        <translation type="unfinished"/>
+        <translation>از STUN استفاده کن</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
-        <translation type="unfinished"/>
+        <translation>آدرس سرور</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>استفاده از TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>دامنهٔ درگاه RTP صدا</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
-        <translation type="unfinished"/>
+        <translation>کمینه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
-        <translation type="unfinished"/>
+        <translation>بیشینه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>امنیت</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>افزاره‌ها</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>افزودن دستگاه</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>لغو</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>خب</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>نشانی منتشر شده</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <translation>گواهی CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
-        <translation type="unfinished"/>
+        <translation>گواهی کاربر</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation>کلید خصوصی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
-        <translation type="unfinished"/>
+        <translation>گذرواژه کلید خصوصی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>آی‌دی رینگ</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
+        <translation>انتخاب فایل</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation>فایل‌ها (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
-        <source>Files (*)</source>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>کلمه عبور اشتباه است.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -383,187 +449,188 @@
     <message>
         <location filename="../callutilsdialog.ui" line="104"/>
         <source>Transfer</source>
-        <translation type="unfinished"/>
+        <translation>انتقال</translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>درخواست‌های تماس</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
+        <translation>ارسال پیام</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
-        <translation type="unfinished"/>
+        <translation>پاسخ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation>رد</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
-        <translation type="unfinished"/>
+        <translation>در حال تماس</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>تماس</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>رونوشت از شماره</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>کپی</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>تماس ورودی از %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +684,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>تصویر</translation>
@@ -624,7 +696,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="249"/>
         <source>Profile</source>
-        <translation type="unfinished"/>
+        <translation>نمایه</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="299"/>
@@ -647,82 +719,82 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
+        <source>days</source>
+        <translation>روز</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation>دستگاه</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>برون‌ریزی</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="132"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>حساب کاربری</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>حساب جدید</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -755,7 +819,7 @@
     <message>
         <location filename="../contactpicker.ui" line="43"/>
         <source>Search...</source>
-        <translation type="unfinished"/>
+        <translation>جستجو...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
@@ -765,7 +829,7 @@
     <message>
         <location filename="../contactpicker.ui" line="75"/>
         <source>New Contact</source>
-        <translation type="unfinished"/>
+        <translation>مخاطب نو</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="98"/>
@@ -779,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>قبول</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>مسدود</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>لغو</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>خب</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -788,7 +931,7 @@
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>کپی</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="52"/>
@@ -809,19 +952,19 @@
         <translation>رینگ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation>پکربندی</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>درباره</translation>
     </message>
 </context>
 <context>
@@ -839,12 +982,12 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>خب</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>لغو</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
@@ -883,12 +1026,12 @@
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>انتخاب فایل</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="61"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>فایل‌ها (*)</translation>
     </message>
 </context>
 <context>
@@ -898,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>حساب رینگ</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1122,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -995,49 +1149,176 @@
     <message>
         <location filename="../videooverlay.ui" line="297"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation>بی‌صدا کردن ویدیو</translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
-        <translation type="unfinished"/>
+        <translation>هم‌رسانی پرونده</translation>
     </message>
 </context>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>ناشناخته</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>پیوند این افزاره به یک حساب</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>نمایه خود را بسازید</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>حساب کاربری خود را بسازید</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
-        <source>Next</source>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>ثبت نام کاربری عمومی (آزمایشی)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>گذرواژه</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>تأیید گذرواژه</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>پیشین</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>بعدی</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_fi.ts

diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index 4e83d8e..8a8743e 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fi" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Julkaisu: Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Ring asiakasohjelma Microsoft Windowsille.
 Ring on turvallinen ja hajautettu keskustelusovellus.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>versio</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Luonut:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Grafiikka:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Pohjautuu SFLPhone projektiin</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Yleiset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Tunnus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tyyppi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Lempinimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametrit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Yhteysosoite</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Käyttäjänimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Salasana</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>poista tunnus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Välityspalvelin</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Vastaajan numero</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Automaattivastaus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP päällä</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Salli puhelut tuntemattomilta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Salli puhelut yhteystiedolta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Salli puhelu historiasta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ring tunnuksen asetukset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Soittoäänen valinta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Toista</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Ääni/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Äänikoodekit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Videokoodekit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Edistyneet asetukset</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Rekistöröinti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Rekistöröinnin aikakatkaisu (sekunneissa):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Verkkoliitäntä</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Paikallinen portti:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Sama kuin paikalliset parametrit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Osoite</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Portti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Käytä STUNia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Palvelimen osoite</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>RTP porttiväli</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Minimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Maksimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP porttiväli</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Turvallisuus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediavirran salaus (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Peru</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Neuvottelun salaus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Salaa neuvottelu (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA sertifikaatti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Käyttäjäsertifikaatti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Henkilökohtainen salausavain</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Henkilökohtaisen salausavaimen salasana</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Varmenna saapuvat sertifikaatit (palvelinpuoli)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Tauota</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Valitse tiedosto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Tiedostot (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>tai näppäile numero...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Keskustelu</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>asetusvalikko</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Virhe generoidessa QR-koodia</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Aloita keskustelu!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>lähetä viesti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Haluaa puhua kanssasi!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Vastaa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Sivuuta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Soittaa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Soita</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Kopioi numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Lisää yhteystietoon</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Jaa sähköpostilla</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Ota yhteyttä minuun Ringillä</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Ring tunnisteeni on:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Näytä QR-koodi</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopioi</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Näytä päivämäärä</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Näytä kehittäjä</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Kopioi nimi</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Kopioi numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Saapuva puhelu %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -618,6 +684,11 @@
         <translation>Pidä pinennettynä suljettaessa</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -648,62 +719,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Tarkista päivitykset automaattisesti joka</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>päivä</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Tarkista päivitykset</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Laitevalinta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Laite</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Tarkkuus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>lisää uusi tunnus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Tuo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Vie</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Tunnus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Uusi tunnus</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Oletko varma että haluat tyhjentää koko historiasi?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Hyväksy</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Peru</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Vahvista</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Määrittelyt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Poistu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Tietoa</translation>
     </message>
@@ -840,7 +982,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>Vahvista</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
@@ -899,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation>Ei oletusarvoista sähköpostiohjelmaa</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Automaattinen</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -969,22 +1122,22 @@
         <translation>Liity puheluihin</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Nimikenttä</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Lisää yhteystietoon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Jaa näyttö</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Jaa osa näytöstä</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Jaa tiedosto</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Odota kun luomme tunnuksesi.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Tuntematon</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Valitse käyttäjänimesi:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Valitse käyttäjänimesi</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Salasana</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Varmista salasana</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 0ff45ea..7773a17 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Crédits</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Version : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Le client Windows de Ring
 Ring est un logiciel de communication sécurisé et distribué.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Ring Windows</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>version</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Créé par :</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Graphismes par :</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Basé sur le projet SFLphone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Général</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Nom d&apos;emprunt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Nom de machine</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>supprimer le compte</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Serveur mandataire</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Numéro de boîte vocale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Répondre automatiquement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP activé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Type de tonalité DTMF</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Autoriser les appels de personnes inconnues</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Autoriser les appels de vos contacts</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Autoriser les appels enregistrés dans l&apos;historique</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>URL du service de noms</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Paramètres Compte Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Choix de sonneries</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Lire</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Codecs audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Codecs vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Options avancées</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Enregistrement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <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="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Interface réseau</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Port local :</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Identique aux paramètres locaux</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <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="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Utiliser STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL du serveur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Utiliser TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Domaine</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Négociation de session SDP (bascule sur ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Plage des ports RTP audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Plage des ports RTP vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Chiffrement du flux média (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Appareils</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Ajouter un nouvel appareil</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Exporter sur le Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Votre code PIN généré :</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Chiffrer les flux média (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Négociation du chiffrement</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Adresse publiée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Chiffrer les négociations (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Certificat CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Certificat utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Clé privée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Mot de passe clé privée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Vérifier les certificats entrants (coté serveur)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Vérifier les réponses des certificats (coté client)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Nécessite un certificat pour les connexions TLS entrantes</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Utiliser les modes de chiffrements par défaut</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pause</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Mauvais mot de passe.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogue</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>ou taper le numéro...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Formulaire</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <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="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Conversations</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Invitations</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>menu des paramètres</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring est une plate-forme de communication texte, audio et vidéo sécurisée et distribuée, sans serveur centralisé, qui laisse le contrôle de la confidentialité à l’utilisateur.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Ceci est votre RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copiez et partagez le avec vos amis !&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Partager votre ring id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-cliquer pour copier.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <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="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Conversation avec</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Démarrer la conversation !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>envoyer le message</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Veut parler avec vous !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Appel en cours</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Appel</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Copier le numéro ou identifiant Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Partager par courriel</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Contactez-moi sur Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mon identifiant Ring est : </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Afficher le code QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Afficher la date</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Afficher l&apos;auteur</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Message en provenance de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Copier le nom</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Appeler le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Copier le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Copier %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Appeler %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>AUCUN COMPTE RING</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Appel entrant de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Conversation avec %1</translation>
@@ -618,6 +684,11 @@
         <translation>Laisser minimisé en fermant</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Vidéo</translation>
@@ -648,62 +719,62 @@
         <translation>Toujours enregistrer</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Vérifier les mises-à-jour automatiquement tous les</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>jours</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Vérifier les mises-à-jour</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Prévisualisation indisponible durant l&apos;appel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Choix de caméra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Périphérique</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Résolution</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Périphérique de sortie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Périphérique d’entrée</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>ajouter un nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exporter</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Lancer Ring au démarrage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Êtes-vous certain de vouloir effacer l&apos;historique ?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Plusieurs méthodes de contact&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Accepter</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Bloquer</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formulaire</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Sortir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>À Propos</translation>
     </message>
@@ -899,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation>Aucun client email trouvé</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Compte Ring</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialogue</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulaire</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -969,22 +1122,22 @@
         <translation>Joindre des appels</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>Étiquette de nom</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Ajouter aux contacts</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Temps écoulé</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Partager tout l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Partager une partie de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Partager un fichier</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Veuillez patienter pendant la création de votre compte.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation>Créer un compte Ring</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Lier cet appareil à un compte</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Créer votre profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Créer votre compte</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Choisissez votre nom d&apos;utilisateur :</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Choisissez un nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Enregistrer un nom d&apos;utilisateur public (expérimental)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Entrer votre code pin</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Confirmer le mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Génération de votre compte Ring…</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Précédent</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 707e417..c4922c2 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -1,572 +1,639 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CA" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_CA" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>À propos</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
         <source>Credits</source>
+        <translation>Crédits</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation>version</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
-        <translation type="unfinished"/>
+        <translation>Créé par:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
-        <translation type="unfinished"/>
+        <translation>Basé sur le projet SFLPhone</translation>
     </message>
 </context>
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>Général</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
-        <translation type="unfinished"/>
+        <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
-        <translation type="unfinished"/>
+        <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
-        <translation type="unfinished"/>
+        <translation>Nom d&apos;hôte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation>Nom d&apos;utilisateur</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>Mot de passe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
-        <translation type="unfinished"/>
+        <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
-        <translation type="unfinished"/>
+        <translation>Numéro de boîte vocale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
+        <translation>Réponse-automatique aux appels</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
+        <translation>Autoriser les appels d&apos;une source inconnue</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation>Autoriser les appels de vos contacts</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres du compte Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
+        <translation>Sélection de sonneries</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation>Audio/Vidéo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation>Audio codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation>Vidéo codecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
-        <translation type="unfinished"/>
+        <translation>Avancé</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation>Enregistrement</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation>Interface réseau</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
-        <translation type="unfinished"/>
+        <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
-        <translation type="unfinished"/>
+        <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
-        <translation type="unfinished"/>
+        <translation>Utiliser le TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
-        <translation type="unfinished"/>
+        <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
-        <translation type="unfinished"/>
+        <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
-        <translation type="unfinished"/>
+        <translation>Sécurité</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Appareils</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Annuler</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
-        <translation type="unfinished"/>
+        <translation>Adresse publiée</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
-        <source>Choose File</source>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation>Choisir le fichier</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
+        <translation>Fichiers (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulaire </translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
-        <translation type="unfinished"/>
+        <translation>ou entrer le numéro</translation>
     </message>
     <message>
         <location filename="../callutilsdialog.ui" line="104"/>
         <source>Transfer</source>
-        <translation type="unfinished"/>
+        <translation>Transfert</translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <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"/>
+        <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
+        <translation>Menu paramètres</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>
+&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Voici votre identifiant Ring&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copiez-le et partagez-le avec vos amis!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation type="unfinished"/>
+        <translation>Partager votre identifiant Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;D&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;Double-cliquer pour copier. &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <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="1067"/>
+        <source>contact request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
-        <translation type="unfinished"/>
+        <translation>Conversation en cours avec</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
-        <translation type="unfinished"/>
+        <translation>Débuter la conversation!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
+        <translation>envoyer le message</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
+        <translation>Veut vous parler!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
-        <translation type="unfinished"/>
+        <translation>Réponse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
-        <translation type="unfinished"/>
+        <translation>appel en cours </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
-        <translation type="unfinished"/>
+        <translation>Appeler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>Copier le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter un contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <translation>Contactez-moi sur Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation>Mon identifiant Ring est:</translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="212"/>
-        <source>My RingId is : </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>Afficher la date</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>Afficher l&apos;auteur</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
+        <translation>Message entrant de %1</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
-        <translation type="unfinished"/>
+        <translation>Appeler le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
-        <translation type="unfinished"/>
+        <translation>Copier le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
-        <translation type="unfinished"/>
+        <translation>Copier %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
-        <translation type="unfinished"/>
+        <translation>Appeler %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
-        <translation type="unfinished"/>
+        <translation>AUCUN COMPTE RING N&apos;A ÉTÉ TROUVÉ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>Appel entrant de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
-        <translation type="unfinished"/>
+        <translation>Conversation en cours avec %1</translation>
     </message>
 </context>
 <context>
@@ -579,22 +646,22 @@
     <message>
         <location filename="../configurationwidget.ui" line="100"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>Général</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="171"/>
         <source>quit settings menu</source>
-        <translation type="unfinished"/>
+        <translation>Quitter le menu paramètres</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="331"/>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres de l&apos;historique</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="372"/>
         <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
+        <translation>Conserver l&apos;historique pour (nombre de jours)</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="415"/>
@@ -604,7 +671,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="469"/>
         <source>Clear History</source>
-        <translation type="unfinished"/>
+        <translation>Effacer l&apos;historique</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="615"/>
@@ -617,6 +684,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Vidéo</translation>
@@ -624,7 +696,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="249"/>
         <source>Profile</source>
-        <translation type="unfinished"/>
+        <translation>Profil</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="299"/>
@@ -634,115 +706,107 @@
     <message>
         <location filename="../configurationwidget.ui" line="506"/>
         <source>Record Settings</source>
-        <translation type="unfinished"/>
+        <translation>Paramètres d&apos;enregistrement</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="539"/>
         <source>Save in :</source>
-        <translation type="unfinished"/>
+        <translation>Enregistrer sous:</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="582"/>
         <source>Always Record</source>
+        <translation>Enregistrer en tout temps</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="709"/>
-        <source>days</source>
-        <translation type="unfinished"/>
+        <translation>Vérifier les mise à jour automatiquement tous les </translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
+        <source>days</source>
+        <translation>jours</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
+        <translation>L&apos;aperçu n&apos;est pas disponible pendant un appel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
-        <translation type="unfinished"/>
+        <translation>Sélection de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation>Appareil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
-        <translation type="unfinished"/>
+        <translation>Résolution</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation type="unfinished"/>
+        <translation>Périphérique de sortie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation type="unfinished"/>
+        <translation>Périphérique d&apos;entrée</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
-        <translation type="unfinished"/>
+        <translation>ajouter un nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Importation</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>Exportation</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="132"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>Compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
+        <translation>Lancer Ring au démarrage</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
-        <translation type="unfinished"/>
+        <translation>Nouveau compte</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
+        <translation>Êtes-vous certain de vouloir effacer tout l&apos;historique?</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
         <source>Choose Directory</source>
-        <translation type="unfinished"/>
+        <translation>Choisir un répertoire</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="409"/>
         <source>An error occured while importing account.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Une erreur s&apos;est produite lors de l&apos;importation du compte</translation>
     </message>
 </context>
 <context>
@@ -750,55 +814,134 @@
     <message>
         <location filename="../contactpicker.ui" line="33"/>
         <source>Existing Contact</source>
-        <translation type="unfinished"/>
+        <translation>Contact existant</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
         <source>Search...</source>
-        <translation type="unfinished"/>
+        <translation>Recherche</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
         <source>Create new contact</source>
-        <translation type="unfinished"/>
+        <translation>Créer un nouveau contact</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="75"/>
         <source>New Contact</source>
-        <translation type="unfinished"/>
+        <translation>Nouveau contact</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation type="unfinished"/>
+        <translation>Inscrire un nom ici</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
         <source>Create</source>
+        <translation>Créer</translation>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulaire </translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formulaire </translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
 </context>
 <context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
         <source>Send text message...</source>
-        <translation type="unfinished"/>
+        <translation>Envoyer un message texte</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>Copier</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="52"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>Afficher la date</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="56"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>Afficher l&apos;auteur</translation>
     </message>
 </context>
 <context>
@@ -809,19 +952,19 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configuration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>À propos</translation>
     </message>
 </context>
 <context>
@@ -829,38 +972,38 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="26"/>
         <source>Path</source>
-        <translation type="unfinished"/>
+        <translation>Chemin d&apos;accès</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="46"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>Mot de passe</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>Ok</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Annuler</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation type="unfinished"/>
+        <translation>Enregistrer le fichier</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>Fichier d&apos;archive Ring (*.ring)</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>Ouvrir un fichier</translation>
     </message>
 </context>
 <context>
@@ -873,22 +1016,22 @@
     <message>
         <location filename="../photoboothdialog.ui" line="58"/>
         <source>or</source>
-        <translation type="unfinished"/>
+        <translation>ou</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="71"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Importation</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>Choisir le fichier</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="61"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Fichiers (*)</translation>
     </message>
 </context>
 <context>
@@ -896,32 +1039,43 @@
     <message>
         <location filename="../utils.cpp" line="185"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation>Aucun client de courriel par défaut n&apos;a été trouvé</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Compte Ring</translation>
     </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
-        <translation type="unfinished"/>
+        <translation>Auto</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
+        <translation>Formulaire </translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -930,114 +1084,241 @@
     <message>
         <location filename="../videooverlay.ui" line="42"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation>Appel en attente</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="119"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation>Mettre en attente / Reprendre l&apos;appel</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="154"/>
         <source>Chat</source>
-        <translation type="unfinished"/>
+        <translation>Clavardage</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="186"/>
         <source>Add person to call</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter une personne à l&apos;appel</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="218"/>
         <source>Transfer call</source>
-        <translation type="unfinished"/>
+        <translation>Transférer un appel</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="256"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation>Couper le microphone</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="367"/>
         <source>Quality</source>
-        <translation type="unfinished"/>
+        <translation>Qualité</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="399"/>
         <source>Join Calls</source>
-        <translation type="unfinished"/>
+        <translation>Joindre l&apos;appel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>Nom de l&apos;étiquette</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
-        <translation type="unfinished"/>
+        <translation>Ajouter au contact</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
-        <translation type="unfinished"/>
+        <translation>00:00</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
-        <translation type="unfinished"/>
+        <translation>Raccrocher</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="297"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation>Couper le son de la vidéo</translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
-        <source>Share entire screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../videoview.cpp" line="235"/>
-        <source>Share screen area</source>
-        <translation type="unfinished"/>
+        <source>Share entire screen</source>
+        <translation>Partager la totalité de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation>Partager une partie de l&apos;écran</translation>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
-        <translation type="unfinished"/>
+        <translation>Partager le fichier</translation>
     </message>
 </context>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>Inconnu</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Associer cet appareil à un compte</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Créer votre profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
+        <translation>Choisir votre nom d&apos;utilisateur</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
-        <source>Next</source>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Enregistrer un nom d&apos;utilisateur public (expérimental)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>Suivant</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

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 e46f9a5..b705e62 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="fr_FR" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>mot de passe</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Annuler</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>ok</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
+        <translation>Pause</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
-        <translation type="unfinished"/>
+        <translation>Répondre</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
-        <translation type="unfinished"/>
+        <translation>Appel</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>Copier le numéro de téléphone</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>Copier</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Copier le nom</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -574,7 +640,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>Réglages</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="100"/>
@@ -617,9 +683,14 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
-        <translation type="unfinished"/>
+        <translation>Vidéo</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="249"/>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -712,17 +783,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Accepter</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Annuler</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -788,7 +930,7 @@
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>Copier</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="52"/>
@@ -806,20 +948,20 @@
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Ring</source>
-        <translation type="unfinished"/>
+        <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -834,7 +976,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="46"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>mot de passe</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -995,23 +1148,23 @@
     <message>
         <location filename="../videooverlay.ui" line="297"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation>Vidéo muette</translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1019,25 +1172,152 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Inconnu</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
-        <source>Next</source>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>mot de passe</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>Suivant</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_he.ts

diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index d7805b7..ce438a8 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="he" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>תודות</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>לקוח Microsoft Windows עבור Ring.
 ‏Ring הינו תוכנת תקשורת מאובטחת ומבוזרת.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Ring חלונות</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>גירסה</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>מבוסס על הפרויקט SFLPhone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>כלליות</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>חשבון</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>טיפוס</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>כינוי</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>פרמטרים</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>שם מארח</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>שם משתמש</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>סיסמה</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>פרוקסי</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>מספר תא קולי</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP מאופשר</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>אודיו/וידאו</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>מתקדם</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>רישום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>ממשק רשת</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>פורט מקומי:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>זהה לפרמטרים מקומיים</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>קבע כתובת ופורט מפורסמים:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>כתובת</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>פורט</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL שרת</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>תחום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>מינימום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>מקסימום</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>אבטחה</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>ביטול</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>תעודת CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>תעודת משתמש</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>מפתח פרטי</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>בחר קובץ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>קבצים (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>דו שיח</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>או הקלד מספר...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>דיונים</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>קריאה</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>העתק מספר</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>הוסף לאיש קשר</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>העתק</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>הצג מועד</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>הצג מחבר</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -618,6 +684,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>וידאו</translation>
@@ -648,62 +719,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>מכשיר</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>רזולוציה</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -713,17 +784,17 @@
         <translation>חשבון</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>חשבון חדש</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>האם אתה בטוח כי ברצונך לטהר את ההיסטוריה שלך?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>קבל</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>ביטול</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>תצורה</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>אודות</translation>
     </message>
@@ -899,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>דו שיח</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -969,22 +1122,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>הוסף לאיש קשר</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>שתף אזור מסך</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>שתף קובץ</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>סיסמה</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>כעת מפיק חשבון Ring שלך...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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
new file mode 100644
index 0000000..a7c74bb
--- /dev/null
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -0,0 +1,1323 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hi_IN" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation>खाता</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <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"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>शुरू करें</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <source>Audio RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
+        <source>Min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <source>Search contacts or enter ring ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>नाम</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation>रिंग</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

translations/ring_client_windows_hr.ts

diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index de41e64..74f5b76 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hr" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation>Zasluge</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Izdanje : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>verzija</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Napravio:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Bazirano na SFLPhone projektu</translation>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Opće</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Vrsta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Ime poslužitelja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Korisničko ime</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Lozinka</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>izbriši račun</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Broj govorne pošte</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Automatski primi pozive</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP omogućen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Postavke Ring računa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Odabir melodije zvona</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>izvodi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Audio kodeci</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Video kodeci</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Napredno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registracija</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Mrežno sučelje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Lokalni port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Isto kao i lokalni parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adresa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Koristi STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL poslužitelja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Koristi TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Minimalno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Maksimalno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sigurnost</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Poništi</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>U redu</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Korisnički certifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privatni ključ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Lozinka privatnog ključa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Izaberite datoteku</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dijalog</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>ili utipkajte broj...</translation>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Razgovori</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>izbornik postavki</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Ovo je vaš RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kopirajte ga i podjelite s vašim prijateljima!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Podjelite vaš ring id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Dvostruki klik za kopiranje.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Greška prilikom generiranja QR koda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Razgovor sa</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Započnite razgovor !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>pošaljite poruku</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Želi govoriti sa vama!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Javi se</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Zovem</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Nazovi</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Kopiraj broj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Dodaj u kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Dijeli pomoću emaila</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Pokaži QRkod</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopiraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Prikaži datum</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Prikaži autora</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Kopiraj broj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopiraj %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Zovi %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>NIJEDAN RING RAČUN NIJE PRONAĐEN</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Dolazni poziv od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Razgovor sa a%1</translation>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -647,62 +718,62 @@
         <translation>Uvijek snimaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Provjeri za ažuriranja svakih</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dana</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Provjeri za ažuriranja...</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Odabir uređaja</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Uređaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Razlučivost</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Izlazni uređaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Ulazni uređaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>dodaj novi kontakt</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Uvezi</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Izvezi</translation>
     </message>
@@ -712,17 +783,17 @@
         <translation>Račun</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Pokreni Ring pri paljenju računala</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Novi račun</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <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>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Prihvati</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blokiraj</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Poništi</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>U redu</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Konfiguracija</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Izađi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring račun</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dijalog</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Dodaj u kontakt</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Dijelite područje zaslona</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Dijeli datoteku</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Molim pričekajte dok napravimo vaš račun.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Nepoznato</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Napravite vaš profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Napravite vaš račun</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Izaberite vaše korisničko ime:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Izaberite vaše korisničko ime</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Lozinka</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Potvrdi lozinku</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 3509b7d..f11f601 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="hu" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Készítők</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Kiadás : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>A Microsoft Windows kliens a Ringhez.
 A Ring egy biztonságos és osztott kommunikációs szoftver</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>verzió</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Szerző:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Művészi elemek készítője:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Az SFLPhone projekt alapjain</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Általános</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Fiók</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Típus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Álnév</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Paraméterek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Kiszolgálónév</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Felhasználónév</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Jelszó</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>fiók törlése</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Hangpostaszám</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Hívások automatikus fogadása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP engedélyezve</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Hívások engedélyezése ismeretlenektől</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <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="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <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="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Webcím névszolgáltatás</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ringfiók beállításai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Csengőhang kiválasztása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Lejátszás</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Hang/videó</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Hangcodekek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Videócodekek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Haladó</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Regisztáció</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <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="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Hálózati interfész</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Helyi port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Ugyanaz, mint a helyi paraméterek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Nyilvános cím és port megadása:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Cím</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>STUN használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Szerver-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>TURN használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Hang RTP port korlát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Minimum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Maximum</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Videó RTP port korlát</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Biztonság</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Média-adatfolyam titkosítása (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Eszközök</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Eszköz hozzáadása</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Mé_gse</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>Rendben</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Nyilvános cím</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA-engedély</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Felhasználói engedély</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privátkulcs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Privátkulcs jelszava</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Bejövő engedélyek vizsgálata (a szerver oldalán)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Válaszengedélyek vizsgálata (a kliens oldalán)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Engedély jelenléte kötelező bejövő TLS kapcsolatok esetén</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Alapértelmezett cipherek használata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Megállítás</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Fájl kiválasztása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Fájlok (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>vagy írjon be egy számot…</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <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="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Beszélgetések</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Partnerkérelmek</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>Beállítások menü</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>A Ring egy biztonságos és osztott hang-, videó- és chatkommunikációs platform, amihez nem szükséges központi szerver, és a magánszféra hatalmát a felhasználó kezében hagyja.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Ez az ön Ringazonosítója.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Másolja ki és ossza meg a barátaival!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Ossza meg a Ringazonosítóját</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Kattinston duplán a másoláshoz!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <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="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Beszélgetések vele:</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>A beszélgetés indítása!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>üzenet küldése</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Beszélni akar önnel!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Válaszol</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Figyelmen kívül hagy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Hívás</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Szám másolása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Hozzáadás a partnerek listájához</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Megosztás emailen keresztül</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Az elérhetőségem a Ringen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>A Ringazonosítóm:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>QR kód mutatása</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Másolás</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Dátum megjelenítése</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Szerző megjelenítése</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Bejövő üzenet a következőtől: %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Szám hívása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Szám másolása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>%1 másolása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>%1 hívása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>RINGFIÓK NEM TALÁLHATÓ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Bejövő hívás tőle: %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Beszélgetés vele: %1</translation>
@@ -618,6 +684,11 @@
         <translation>Bezáráskor legyen minimalizálva</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Videó</translation>
@@ -648,62 +719,62 @@
         <translation>Mindig legyen felvétel</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Frissítések ellenőrzése minden</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>nap</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Frissítések ellenőrzése</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <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="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Eszköz kiválasztása</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Eszköz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Felbontás</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Kimeneti eszköz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Bemeneti eszköz</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>új fiók hozzáadása</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importálás</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exportálás</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Fiók</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>A Ring indítása rendszerindításkor</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Új fiók</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <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>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Többféle elérhetőségi metódus&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Elfogadás</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blokkolás</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Mé_gse</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Konfiguráció</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Kilépés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Névjegy</translation>
     </message>
@@ -899,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation>Nem találtam alapértelmezett levelezőklienst</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -969,22 +1122,22 @@
         <translation>Hívások csatlakozása</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Névcímke</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <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="582"/>
         <source>Time elapsed</source>
         <translation>Eltelt idő</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Az egész képernyő megosztása</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Képernyő részének megosztása</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Fájl megosztása</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Kérem, várjon, amíg létrehozzuk az ön fiókját!</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Ismeretlen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Válasszon egy felhasználónevet:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Jelszó</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>A Ringfiókja létrehozása…</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Vissza</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 9c5efe4..c46ffcb 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="id" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Akun</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>Salin nomor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation type="unfinished"/>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -712,17 +783,17 @@
         <translation>Akun</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Terima</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blokir</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -806,20 +948,20 @@
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Ring</source>
-        <translation type="unfinished"/>
+        <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1019,25 +1172,152 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Tidak diketahui</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
-        <source>Next</source>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>Selanjutnya</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_it.ts

diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 5e0daa0..f4e3e44 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="it" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Nome Host</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nome utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Numero di voicemail</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Risposta automatica alle chiamate</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP attivato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avanzato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registrazione</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Timeout di espirazione della registrazione (seconds):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Interfaccia di rete</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Identico alle impostazioni locali</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Digitare l&apos;indirizzo pubblicato e il porto:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Usare STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Usare TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Negoziazione sessione SDP (sostituto a ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Intervallo porti audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Massimo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Intervallo porti video RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Cancella</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Cifratura della negoziazione</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Indirizzo di publicazione</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Negoziazione della cifratura (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Certificato dell&apos;autorita</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Certificato utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Chiave privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Password della chiave privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Verificare i certificati in arrivo (dal lato del server)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Verificare i certificati di risposta (dal lato del cliente)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Richiedere un certificato per le connessione in arrivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Usare il cifrario di default</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Converzazioni</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring è una piattaforma di voce, video, e chat, distribuita, che non richiede nessuno server centralizzato e lascia il controllo della privacy in mano ai suoi utenti.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Chiamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Chiama</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Copia il numerp</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importare</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Esportare</translation>
     </message>
@@ -712,17 +783,17 @@
         <translation>Profilo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nuovo account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Accettare</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Cancella</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation>Suona</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Condividere una porzione dello schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Condividere file</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Sconosciuto</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Confermare password</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Generazione del account Ring in corso…</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 a65e374..7a8a80c 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -1,11 +1,11 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="it_IT" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>Info</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
@@ -13,560 +13,627 @@
         <translation>Crediti</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>Client Ring per Microsoft Windows.
+Ring è un software per comunicazioni sicure e distribuite.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>versione</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Creato da:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
-        <translation type="unfinished"/>
+        <translation>Tema di:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
-        <translation>Ispirato al progetto SFLPhone</translation>
+        <translation>Basato sul progetto SFLPhone</translation>
     </message>
 </context>
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Generale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Hostname</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Password</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>cancella utente</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Numero voicemail</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
-        <translation>Chiamate auto risposte</translation>
+        <translation>Risposta automatica alle chiamate</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP abilitato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Permetti chiamate da sconosciuti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Permetti chiamate dai contatti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
-        <translation>Permetti chiamate dalla </translation>
+        <translation>Permetti chiamate dalla cronologia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>URL del servizio di nomi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Opzioni dell&apos;account Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
+        <translation>Seleziona suoneria</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Avvia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation>Codec audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation>Codec video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avanzato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registrazione</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Scadenza timeout di registrazione (secondi):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation>Interfaccia di rete</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
-        <translation type="unfinished"/>
+        <translation>Porta locale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Uguale ai parametri locali</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Imposta l&apos;indirizzo pubblicato e la porta:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Indirizzo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Utilizza STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
-        <translation type="unfinished"/>
+        <translation>URL del server</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Utilizza TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation>Realm</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation>Negoziazione sessione SDP (usa ICE in caso contrario)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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 è supportato dal server o dal peer.</translation>
+        <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>Intervallo porte audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>Intervallo porte video RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sicurezza</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
+        <translation>Crittografia Media Stream (SRTP)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Dispositivi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Aggiungi dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Esporta su Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Il pin generato per te:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
-        <translation type="unfinished"/>
+        <translation>Cifra lo stream media (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
-        <translation type="unfinished"/>
+        <translation>Indirizzo Pubblico</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <translation>Certificato CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
-        <translation type="unfinished"/>
+        <translation>Certificato Utente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation>Chiave Privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
-        <translation type="unfinished"/>
+        <translation>Password Chiave Privata</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
-        <translation type="unfinished"/>
+        <translation>Usa il cifrario di default</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pausa</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
+        <translation>Scegli un file</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation>Files (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
-        <source>Files (*)</source>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Password errata.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Modulo</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
-        <translation type="unfinished"/>
+        <translation>O scrivi un numero...</translation>
     </message>
     <message>
         <location filename="../callutilsdialog.ui" line="104"/>
         <source>Transfer</source>
-        <translation type="unfinished"/>
+        <translation>Trasferisci</translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Modulo</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
+        <translation>Cerca un contatto o inserisci il suo Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Conversazioni</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Richiesta di contatto</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
-        <translation type="unfinished"/>
+        <translation>Menù Impostazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>RIng è una piattaforma di comunicazione video, voce e chat sicura e distribuita che non richiede un server centrale e lascia il potere e la privacy nelle mani dell&apos;utente.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Questo è il tuo RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copialo e condividilo con i tuoi amici!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation type="unfinished"/>
+        <translation>Condividi il tuo Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Doppio click per copiare.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
+        <translation>Errore durante la generazione del Codice QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
-        <translation type="unfinished"/>
+        <translation>Conversazione con</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
-        <translation type="unfinished"/>
+        <translation>Inizia la conversazione!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
+        <translation>Invia Messaggio</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
+        <translation>Vuole parlare con te!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
-        <translation type="unfinished"/>
+        <translation>Rispondi</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ignora</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Sta chiamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Chiamata</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Copia numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Aggiungi ai contatti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Condividi per email</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <translation>Contattami su RIng</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation>Il mio Ring ID è:</translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="212"/>
-        <source>My RingId is : </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
         <source>Copy</source>
         <translation>Copia</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Mostra data</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Mostra autore</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>Messaggio in arrivo da %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Copia nome</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
-        <translation type="unfinished"/>
+        <translation>Chiama Numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Copia numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
-        <translation type="unfinished"/>
+        <translation>Copia %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
-        <translation type="unfinished"/>
+        <translation>Chiama %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
-        <translation type="unfinished"/>
+        <translation>NESSUN ACCOUNT RING TROVATO</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>Chiamata in arrivo da %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
-        <translation type="unfinished"/>
+        <translation>Conversazione con %1</translation>
     </message>
 </context>
 <context>
@@ -584,22 +651,22 @@
     <message>
         <location filename="../configurationwidget.ui" line="171"/>
         <source>quit settings menu</source>
-        <translation type="unfinished"/>
+        <translation>Esci dalle impostazioni</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="331"/>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation>Impostazioni Cronologia</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="372"/>
         <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
+        <translation>Mantieni la cronologia per (Giorni)</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="415"/>
         <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
+        <translation>(0 per cronologia illimitata)</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="469"/>
@@ -609,11 +676,16 @@
     <message>
         <location filename="../configurationwidget.ui" line="615"/>
         <source>Misc. Settings</source>
-        <translation type="unfinished"/>
+        <translation>Impostazioni Varie</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="637"/>
         <source>Keep minimized on close</source>
+        <translation>Minimizza alla chiusura</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -634,115 +706,107 @@
     <message>
         <location filename="../configurationwidget.ui" line="506"/>
         <source>Record Settings</source>
-        <translation type="unfinished"/>
+        <translation>Controlla aggiornamenti</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="539"/>
         <source>Save in :</source>
-        <translation type="unfinished"/>
+        <translation>Salva in:</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="582"/>
         <source>Always Record</source>
+        <translation>Registra Sempre</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
+        <translation>Cerca aggiornamenti ogni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>giorni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Controlla aggiornamenti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
+        <translation>Anteprima non disponibile durante la chiamata</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
-        <translation type="unfinished"/>
+        <translation>Seleziona Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
-        <translation type="unfinished"/>
+        <translation>Risoluzione</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation type="unfinished"/>
+        <translation>Dispositivo di Uscita</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation type="unfinished"/>
+        <translation>Dispositivo di Ingresso</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
-        <translation type="unfinished"/>
+        <translation>aggiungi un nuovo account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Importa</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>Esporta</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="132"/>
         <source>Account</source>
-        <translation>Utente</translation>
+        <translation>Account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
+        <translation>Esegui Ring all&apos;avvio</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nuovo Account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
+        <translation>Sei sicuro di voler cancellare tutta la cronologia?</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
         <source>Choose Directory</source>
-        <translation type="unfinished"/>
+        <translation>Scegli Cartella</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="409"/>
         <source>An error occured while importing account.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
+        <translation>Un errore è occorso durante l&apos;importazione dell&apos;account.</translation>
     </message>
 </context>
 <context>
@@ -750,40 +814,119 @@
     <message>
         <location filename="../contactpicker.ui" line="33"/>
         <source>Existing Contact</source>
-        <translation type="unfinished"/>
+        <translation>Contatto Esistente</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
         <source>Search...</source>
-        <translation type="unfinished"/>
+        <translation>Cerca...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
         <source>Create new contact</source>
-        <translation type="unfinished"/>
+        <translation>Crea un nuovo contatto</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="75"/>
         <source>New Contact</source>
-        <translation type="unfinished"/>
+        <translation>Nuovo Contatto</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation type="unfinished"/>
+        <translation>Inserisci un nome qui...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
         <source>Create</source>
+        <translation>Crea</translation>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Modulo</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Accetta</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blocca</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Modulo</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Annulla</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
 </context>
 <context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
         <source>Send text message...</source>
-        <translation type="unfinished"/>
+        <translation>Invia un messaggio di testo...</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
@@ -806,22 +949,22 @@
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Ring</source>
-        <translation type="unfinished"/>
+        <translation>Squilla</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation>Configurazione</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>Info</translation>
     </message>
 </context>
 <context>
@@ -829,7 +972,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="26"/>
         <source>Path</source>
-        <translation type="unfinished"/>
+        <translation>Percorso</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="46"/>
@@ -839,7 +982,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>Ok</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
@@ -849,18 +992,18 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation type="unfinished"/>
+        <translation>Salva File</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>File archivio di RIng (*.ring)</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>Apri File</translation>
     </message>
 </context>
 <context>
@@ -868,27 +1011,27 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation type="unfinished"/>
+        <translation>Photobooth</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="58"/>
         <source>or</source>
-        <translation type="unfinished"/>
+        <translation>oppure</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="71"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Importa</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>Scegli un file</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="61"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>Files (*)</translation>
     </message>
 </context>
 <context>
@@ -896,32 +1039,43 @@
     <message>
         <location filename="../utils.cpp" line="185"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation>Nessun client E-Mail di Default</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Account Ring</translation>
     </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
-        <translation type="unfinished"/>
+        <translation>Auto</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Modulo</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -930,88 +1084,88 @@
     <message>
         <location filename="../videooverlay.ui" line="42"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation>Chiamata in attesa...</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="119"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation>Pausa / Riprendi</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="154"/>
         <source>Chat</source>
-        <translation type="unfinished"/>
+        <translation>Chat</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="186"/>
         <source>Add person to call</source>
-        <translation type="unfinished"/>
+        <translation>Aggiungi alla chiamata</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="218"/>
         <source>Transfer call</source>
-        <translation type="unfinished"/>
+        <translation>Trasferisci chiamata</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="256"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation>Mutati</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="367"/>
         <source>Quality</source>
-        <translation type="unfinished"/>
+        <translation>Qualità</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="399"/>
         <source>Join Calls</source>
-        <translation type="unfinished"/>
+        <translation>Entra in chiamata</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>Etichetta Nome</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Aggiungi ai contatti</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
-        <translation type="unfinished"/>
+        <translation>Tempo trascorso</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
-        <translation type="unfinished"/>
+        <translation>00:00</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
-        <translation type="unfinished"/>
+        <translation>Aggancia</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="297"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation>Muta Video</translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
-        <translation type="unfinished"/>
+        <translation>Condividi l&apos;intero schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Condividi l&apos;area dello schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Condividi file</translation>
     </message>
@@ -1019,25 +1173,152 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>Sconosciuto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Collega questo dispositivo ad un account</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Crea il tuo profilo</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Crea il tuo account</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
+        <translation>Scegli il tuo Username</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
-        <source>Next</source>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Registra un nome utente pubblico (sperimentale)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Password</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Conferma password</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Generazione del tuo account Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Precedente</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>Prossimo</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_ja.ts

diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
new file mode 100644
index 0000000..b75eb8a
--- /dev/null
+++ b/translations/ring_client_windows_ja.ts
@@ -0,0 +1,1323 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ja" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation>クレジット</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation>バージョン</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation>全般</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation>アカウント</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation>パラメーター</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <source>Hostname</source>
+        <translation>ホスト名</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <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"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation>プロキシ</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation>ボイスメール番号</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation>自動応答呼び出し</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation>UPnP 有効</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>名前サービス URL</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>再生</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation>音声/動画</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation>詳細</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation>登録</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation>ネットワークインターフェイス</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation>ローカルパラメーターと同じ</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation>アドレス</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation>ポート番号</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation>TURNを使用</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <source>Audio RTP Port Range</source>
+        <translation>音声 RTP ポートの範囲</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
+        <source>Min</source>
+        <translation>最小</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation>最大</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation>セキュリティ</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>端末</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>キャンセル</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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>発行されたアドレス</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation>プライベートキー</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>パスワードが間違っています。</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation>転送</translation>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <source>Search contacts or enter ring ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>連絡先のリクエスト</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation>応答</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation>無視</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation>発信中</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation>通話</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation>番号をコピー</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>名前をコピー</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation>全般</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation>履歴を消去</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation>プロフィール</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>名前</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation>日</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation>端末</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation>新規アカウント</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>受け入れ</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>ブロック</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation>コピー</translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation>Ring</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation>設定</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation>キャンセル</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ringアカウント</translation>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation>受話</translation>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation>動画オフ</translation>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation>不明</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>このデバイスをアカウントへリンク</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>プロフィールを作成</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>公開ユーザー名を登録 (実験的)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>パスワード</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>パスワードの再入力</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>次へ</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

translations/ring_client_windows_lt.ts

diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index 74b4f29..b9fb67d 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="lt" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Padėkos</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Laida : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation>Laida : Beta 2 - Gaston Miron</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows kliento programa, skirta Ring.
 Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>versija</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Sukūrė:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Apipavidalino:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Pagrįsta SFLPhone projektu</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Bendra</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Paskyra</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tipas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Slapyvardis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametrai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Kompiuterio vardas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Naudotojo vardas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Slaptažodis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>ištrinti paskyrą</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Įgaliotasis serveris</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Balso pašto numeris</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Automatiškai atsiliepti į skambučius</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP įjungta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>DTMF tono tipas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Leisti skambučius nuo nepažįstamųjų</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Leisti skambučius nuo kontaktų</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Leisti skambučius iš istorijos</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation>Registruoti blokų grandinėje</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Vardų paslaugos URL</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ring paskyros nustatymai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Skambučio melodijos pasirinkimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Groti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Garsas/Vaizdas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Garso kodekai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Vaizdo kodekai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Išplėstiniai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registracija</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Registracijos galiojimo pabaigos laiko limitas (sekundžių):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Tinklo sąsaja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Vietinis prievadas:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Toks pats kaip vietiniai parametrai</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Nustatyti paskelbtą adresą ir prievadą:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adresas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Prievadas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Naudoti STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Serverio URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Naudoti TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Sritis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP seanso derėjimasis (ICE surogatas)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Garso RTP prievadų rėžis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Maž.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Didž.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Vaizdo RTP prievadų rėžis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Saugumas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Medija srauto šifravimas (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Įrenginiai</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Pridėti įrenginį</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation>Slaptažodis (būtinas)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Atsisakyti</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Eksportuoti Ring sistemoje</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Jūsų sukurtas pin:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>Gerai</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Šifruoti medija srautą (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Derėjimosi šifravimas</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Paskelbtas adresas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Šifruoti derėjimąsi (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>LĮ liudijimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Naudotojo liudijimas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privatusis raktas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Privačiojo rakto slaptažodis</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Tikrinti gaunamus liudijimus (serverio pusėje)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Tikrinti atsakomuosius liudijimus (kliento pusėje)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Reikalauti liudijimo gaunamiems TLS ryšiams</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Naudoti numatytuosius šifrus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pristabdyti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Pasirinkti failą</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Failai (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation>Tinklo klaida. Prašome vėliau bandyti dar kartą.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Neteisingas slaptažodis.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation>Registruojama... Tai gali šiek tiek užtrukti</translation>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>arba įrašykite numerį...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <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="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Pokalbiai</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Kontakto užklausos</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>nustatymų meniu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring yra saugi ir paskirstytoji balso, vaizdo ir pokalbių susisiekimo platforma, kuri nereikalauja centralizuoto serverio ir palieka visą privatumo galią naudotojo rankose.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Tai yra jūsų RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Nukopijuokite ir dalinkitės juo su savo draugais!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Dalintis savo ring id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Spustelėkite du kartus, kad nukopijuotumėte.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
-        <translation>Klaida, generuojant QR kodą</translation>
+        <translation>Klaida, kuriant QR kodą</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Pokalbis su</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Pradėkite pokalbį !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>siųsti žinutę</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Nori su jumis pakalbėti!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Atsiliepti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Nepaisyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Skambinama</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Skambutis</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Kopijuoti numerį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Pridėti prie kontaktų</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <translation>Susisiekite su manimi per Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mano RingId yra : </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Rodyti QR kodą</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopijuoti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Rodyti datą</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Rodyti autorių</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Gauta žinutė nuo %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Kopijuoti numerį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopijuoti %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>NERASTA RING PASKYRA</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Gaunamasis skambutis nuo %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Pokalbis su %1</translation>
@@ -618,6 +684,11 @@
         <translation>Užvėrus, palikti suskleistą</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Vaizdas</translation>
@@ -648,62 +719,62 @@
         <translation>Visada įrašinėti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Tikrinti ar yra atnaujinimų kas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dienas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Tikrinti ar yra atnaujinimų</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Skambučio metu, peržiūra neprieinama</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Įrenginio pasirinkimas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Įrenginys</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Raiška</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Išvesties įrenginys</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Įvesties įrenginys</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>pridėti naują paskyrą</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importuoti</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Eksportuoti</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Paskyra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Paleisti Ring, įjungus kompiuterį</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nauja paskyra</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Ar tikrai norite išvalyti visą savo istoriją?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Priimti</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Užblokuoti</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation>Ring - paskyros ištrynimas</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation>Ar tikrai norite ištrinti paskyrą?</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation>Šis veiksmas yra neatšaukiamas</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>Jeigu ši paskyra nebuvo eksportuota ar pridėta į kitą įrenginį, ji bus prarasta</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Atsisakyti</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Gerai</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Konfigūracija</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Išeiti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Apie</translation>
     </message>
@@ -899,30 +1041,41 @@
         <source>No default mail client found</source>
         <translation>Numatytoji pašto kliento programa nerasta</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring paskyra</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Automatinė</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -969,22 +1122,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Vardo etiketė</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Pridėti prie kontaktų</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Praėjęs laikas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Bendrinti visą ekraną</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Bendrinti ekrano sritį</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Bendrinti failą</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Prašome palaukti, kol sukursime jūsų paskyrą.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation>Perkeliama jūsų Ring paskyra...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Nežinoma</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation>Pridėti įrenginį</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation>Naudotojo vardas neprieinamas.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation>Naudotojo vardas yra prieinamas.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation>Naudotojo vardas yra neteisingas.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation>Tinklo klaida.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation>Sukurti Ring paskyrą</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Susieti šį įrenginį su paskyra</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation>Kaip pridėti įrenginį</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Susikurkite savo profilį</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Susikurkite savo paskyrą</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Pasirinkite savo naudotojo vardą:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Pasirinkite savo naudotojo vardą</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation>Ieškoma...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Registruoti viešąjį naudotojo vardą (eksperimentinis)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Įveskite savo pin</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Slaptažodis</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Patvirtinkite slaptažodį</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Kuriama jūsų Ring paskyra...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Ankstesnis</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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
new file mode 100644
index 0000000..b49feae
--- /dev/null
+++ b/translations/ring_client_windows_ms.ts
@@ -0,0 +1,1324 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ms" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation>Tentang</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation>Kredit</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation>Aplikasi Ring untuk Microsoft Windows.
+Ring adalah aplikasi komunikasi yang sulit dan tersebar.</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation>versi</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation>Dicipta oleh:</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation>Kerja seni oleh:</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation>Berdasarkan projek </translation>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation>Aturan</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation>Utama</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation>Akaun</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation>Butiran</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <source>Hostname</source>
+        <translation>Alamat server</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <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"/>
+        <source>Password</source>
+        <translation>Kara laluan</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation>Proksi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation>Nombor peti suara</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation>Jawab panggilan automatik</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation>UPnP diaktifkan</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation>Benarkan Panggilan Daripada TidaK Diketahui</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation>Benarkan Panggilan Daripada Kenalan</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation>Benarkan Panggilan Daripada Sejarah</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation>Tetapan Akaun Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation>Pilihan Nada Bunyi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>Main</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation>Codec Audio</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation>Codec Video</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation>Lanjut</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation>Pendaftaran</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation>Guna TURN</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <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"/>
+        <source>Min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation>Penyulitan</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Perangkat</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Batal</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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>Alamat server pengagihan</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation>Pindah</translation>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <source>Search contacts or enter ring ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation>Memanggil</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation>Panggilan</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation>Salin nombor</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation>Aturan</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation>Utama</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>Nama</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Terima</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation>Ring</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation>Konfigurasi</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation>Tentang</translation>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation>Kara laluan</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation>Batal</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Akaun Ring</translation>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation>Tidak diketahui</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Sambungkan perangkat ini dengan akaun</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Kara laluan</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Sahkan kata laluan</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

translations/ring_client_windows_nb.ts

diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index f9b8ee2..4a998c5 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nb" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Generell</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Vertsnavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Brukernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Passord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Talepostkassenummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Auto-svar på samtaler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktivt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Spill av</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Lyd/Bilde</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avansert</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tidsgrense for registrering (sekunder):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Samme som lokale parametre</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Oppgi publisert adresse og port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Bruk STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Bruk TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>RTP-portintervall for tale</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Maks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Sikkerhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Avbryt</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Publisert adresse</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Krypter forhandling (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA-sertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Brukersertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privat nøkkel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Passord for privatnøkkel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Kontroller innkommende sertifikater (tjenersiden)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Kontroller svarsertifikater (klientsiden)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Krev sertifikat for innkommende TLS-forbindelser</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Bruk standardsifer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Samtaler</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring er en sikker og distribuert tale, video og meldingskommunikasjonsplatform som ikke krever en sentral tjener og legger kontroll over privatsfæren i hendene til brukeren.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Kaller opp</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopier</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dager</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importer</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Eksporter</translation>
     </message>
@@ -712,17 +783,17 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Ny konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Aksepter</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Oppsett</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Del skjermområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Ukjent</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Passord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Bekreft passord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Lager din Ring-konto...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 f89ed03..8b4e5be 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Credits</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Uitgave: Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation>Uitgave: Beta 2 - Gaston Miron</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>De Microsoft Windows-cliënt voor Ring.
 Ring is software voor beveiligde en gedistribueerde communicatie.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>versie</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Geschreven door:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Illustraties door:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Gebaseerd op het SFLPhone-project</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parameters</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Hostnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>account verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Voicemailnummer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Oproepen automatisch beantwoorden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP ingeschakeld</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Type kiestoon (DTMF)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Oproep van onbekende aanvaarden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Oproep van contact aanvaarden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Oproepen van gebruikers in oproepgeschiedenis aanvaarden</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation>Publieke gebruikersnaam</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation>Registreren op blokketen</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Naamdienst-URL</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ring-accountinstellingen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Beltoonselectie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Afspelen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Audiocodecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Videocodecs</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Geavanceerd</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registratie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Registratie verval time-out (seconden):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Netwerkinterface</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Lokale poort:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Gelijk aan lokale parameters</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Stel gepubliceerd adres en poort in:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Poort</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>STUN gebruiken</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Server-URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>TURN gebruiken</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Realm</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP-sessieonderhandeling (ICE-terugvaloptie)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Audio RTP-poortenreeks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP-poortenreeks</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediastreamversleuteling (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Apparaten</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Apparaat toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation>Wachtwoord (vereist)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Exporteren naar de Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Je gegenereerde pincode:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation>Pincode</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>Oké</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Onderhandelingsversleuteling</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Gepubliceerd adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Onderhandeling versleutelen (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA-certificaat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Gebruikerscertificaat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Geheime sleutel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Wachtwoord geheime sleutel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Inkomende certificaten verifiëren (serverzijde)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Uitgaande certificaten verifiëren (clientzijde)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Certificaat voor inkomende TLS-verbindingen vereisen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Standaardcodering gebruiken</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pauze</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>Ring-ID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Kies bestand</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation>Je pincode wordt gegenereerd, even geduld.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation>Netwerkfout, probeer het later opnieuw.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Verkeerd wachtwoord.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation>Bezig met registreren… Dit kan even duren</translation>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation>Geblokkeerde ID</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation>Contact deblokkeren en toevoegen aan contactenlijst</translation>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>of geef een nummer in...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <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="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Gesprekken</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Contactverzoeken</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>instellingenmenu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring is een veilig en gedistribueerd spraak-, video- en chatcommunicatieplatform dat geen centrale server vereist en de kracht van privacy in handen van de gebruiker laat.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Dit is uw Ring-ID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Deel hem met uw vrienden!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Dit is je Ring-ID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Deel hem met je vrienden!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation>Uw Ring-ID delen</translation>
+        <translation>Deel je Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Dubbelklik om te kopiëren.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Fout bij het aanmaken van QR-code</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation>contactverzoek</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Gesprek met</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Begin het gesprek!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>bericht versturen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
-        <source>Wants to talk to you!</source>
-        <translation>Wil met u praten!</translation>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation>BestId</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation>Wil met je praten!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Beantwoorden</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Bellen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Oproep</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Aan contact toevoegen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Delen per e-mail</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Contacteer mij via Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mijn Ring-ID is:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>QR-code tonen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Datum tonen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Auteur tonen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Inkomend bericht van %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Naam kopiëren</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Nummer bellen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>%1 kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>%1 bellen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>GEEN RING-ACCOUNT GEVONDEN</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Inkomende oproep van %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Gesprek met %1</translation>
@@ -618,6 +684,11 @@
         <translation>Minimaliseren bij sluiten</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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>
@@ -648,62 +719,62 @@
         <translation>Altijd opnemen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
-        <source>Check for update automatically every</source>
-        <translation>Automatisch naar updates zoeken elke</translation>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation>Meldingen inschakelen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation>Automatisch controleren op updates elke</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dagen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Naar updates zoeken</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Voorbeeldweergave niet beschikbaar gedurende oproep</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Apparaatselectie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Apparaat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Resolutie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Uitvoerapparaat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Invoerapparaat</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
-        <translation>nieuw account toevoegen</translation>
+        <translation>nieuwe account toevoegen</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importeren</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exporteren</translation>
     </message>
@@ -713,19 +784,19 @@
         <translation>Account</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Ring automatisch starten</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Account aanmaken</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation>Weet u zeker dat u de geschiedenis wilt wissen?</translation>
+        <translation>Weet je zeker dat je de geschiedenis wil wissen?</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Meerdere contactmethoden&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -771,7 +834,7 @@
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation>Hier een naam invoeren...</translation>
+        <translation>Voer hier een naam in...</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation>Inkomend contactverzoek</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation>nameLabel</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation>bestIdLabel</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Aanvaarden</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation>Verwerpen</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blokkeren</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formulier</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation>Ring - accountverwijdering</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation>Wil je je account echt verwijderen?</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation>Deze handeling kan niet ongedaan gemaakt worden</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>Als deze account nog niet geëxporteerd is of nog niet toegevoegd is aan een ander apparaat, zal ze verloren gaan</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Annuleren</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Oké</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Geen standaard-e-mailprogramma gevonden</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring-account</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialoog</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulier</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>TextLabel</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation>ContactID</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation>TODO: doel van contactverzoek uitleggen</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation>Contactverzoek verzenden</translation>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Gesprekken samenvoegen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Naam label</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Aan contact toevoegen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Tijd verstreken</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Scherm delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Schermruimte delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Bestand delen</translation>
     </message>
@@ -1020,23 +1173,159 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>We maken uw account aan, even geduld.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation>Je account moet gemigreerd worden. Kies een wachtwoord.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation>Je Ring-account wordt gemigreerd...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Onbekend</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
-        <source>Choose your username:</source>
-        <translation>Kies uw gebruikersnaam:</translation>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <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.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation>Een apparaat toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation>Gebruikersnaam is niet beschikbaar.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation>Gebruikersnaam is beschikbaar.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation>Gebruikersnaam is ongeldig.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation>Netwerkfout.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation>Ring-account aanmaken</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Dit apparaat aan een account koppelen</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation>Hoe voeg ik een apparaat toe</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&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:&apos;Ubuntu&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-size:12pt;&quot;&gt;Om dit apparaat aan een andere account te koppelen moet je eerst &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;een pincode verkrijgen&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;. Om de pincode te beheren:&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-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;Ga naar de &lt;span style=&quot; font-weight:600;&quot;&gt;accountbeheerinstellingen&lt;/span&gt; van een vorig apparaat&lt;/li&gt;
+&lt;li style=&quot; 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;Kies de &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-account&lt;/span&gt; die je wil gebruiken&lt;/li&gt;
+&lt;li style=&quot; 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;Ga naar het tabblad &lt;span style=&quot; font-weight:600;&quot;&gt;Apparaten&lt;/span&gt;&lt;/li&gt;
+&lt;li style=&quot; 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;Selecteer &lt;span style=&quot; font-weight:600;&quot;&gt;Een apparaat toevoegen&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-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-size:12pt; font-weight:600;&quot;&gt;10 minuten&lt;/span&gt;geldig&lt;span style=&quot; 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="159"/>
+        <source>Create your profile</source>
+        <translation>Maak je profiel aan</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation>Voer je volledige naam in:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Maak je account aan</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation>Kies je gebruikersnaam:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Kies je gebruikersnaam</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation>Zoeken...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Registreer een publieke gebruikersnaam (experimenteel)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Voer je pincode in</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Bevestig wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Je Ring-account wordt aangemaakt...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Vorige</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 fc8430b..49b2840 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="nl_NL" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Algemeen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Type</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Wachtwoord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Spelen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Gevorderd</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Beveiliging</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Bellen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Kopieër nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Video</translation>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -712,17 +783,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation>Bellen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Wachtwoord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 1f1425a..946e9be 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pa" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pa" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>ਸੈਟਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation type="unfinished"/>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -712,17 +783,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation>ਰਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 03dd15f..71214bb 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Podziękowania</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Wydanie : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Klient Ring dla Microsoft Windows.
 Ring jest strzeżonym i rozdzielonym programem komunikacyjnym.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>Wersja</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Stworzone przez:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Obrazki przez:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Na podstawie projektu SFLPhone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Generalne</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametry</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Nazwa hosta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nazwa użytkownika</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Hasło</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>Usuń konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Pełnomocnik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Numer poczty głosowej</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Automatyczne odbierz połączeńia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP jest włączone</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Typ tonu DTMF</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Zezwól Na Połączenia Od Nieznanych</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Zezwól Na Połączenia Od Kontaku</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Zezwól Na Połączenia Od Historii</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ustawienia Konta Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Wybierz Dzwonek</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Graj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Audio/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Kodeki audio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Kodeki wideo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Zaawansowane</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Rejestracja</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Limit czasu do rejestracji (w sekundach) :</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Interfejs Sieciowy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Port lokalny:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Tak samo jak lokalne parametry.</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Ustaw opublikowany adres i port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Użyj STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>serwer URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Użyj TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>sfera</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <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="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Zakres Portów Audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Zakres Portów Wideo RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Zabezpieczenia</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Szyfrowanie Strumieni Multimedialnych (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Anuluj</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Negocjacja szyfrowania</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Opublikowany Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Negocjacja szyfrowania (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Certyfikat CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Certyfikat użytkownika</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Klucz prywatny</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Hasło klucza prywatnego</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Zweryfikuj przychodzące certyfikaty (po stronie serwera)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Zweryfikuj odesłane certyfikaty (po stronie klienta)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Wymagamy certyfikat dla przychodzących połączeń TLS</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Użyj domyślnych szyfrów</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pauza</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Pliki (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Błędne hasło.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>albo wpisz numer...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Forma</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Szukaj kontakty lub wpisz Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Rozmowy</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Zaproszenia</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>ustawienia menu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring jest bezpieczną i rozprowadzoną platformą komunikacji głosowej, wideo, i czat, który nie wymaga scentralizowanego serwera i pozostawia moc prywatności w rękach użytkownika.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;To jest twój RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Skopiuj go i podziel się nim ze swoimi przyjaciółmi!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Podziel się swoim ring id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Kliknij dwukrotnie aby skopiować.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Wystąpił błąd podczas generowania kodu QR.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Rozmowa z</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Zacznij rozmowę !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>wyślij wiadomość</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Chce z tobą rozmawiać!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Odbierz</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Dzwonienie</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Dzwoń</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Skopiuj numer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Dodaj do kontaku</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Udostępnij przez e-mail.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Skontaktuj się ze mną na Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mój RingId to:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Pokaż QRCode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Skopiuj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Wyświetl datę</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Wyświetl autora</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Przychodząca wiadomość od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Numer Połączeńia</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Skopiuj Numer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Skopiuj %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Dzwoń do %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>NIE ZNALEZIONO ŻADNEGO KONTA RING</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Połączenie przychodzące od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Rozmowa z %1</translation>
@@ -618,6 +684,11 @@
         <translation>Przechowaj zminimalizowane przy zamknięciu</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Wideo</translation>
@@ -648,62 +719,62 @@
         <translation>Zawsze Nagrywaj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Sprawdź po aktualizacje automatycznie co</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dni</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Sprawdź po aktualizacje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Podgląd jest niedostępny podczas rozmowy</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Wybierz Urządzenie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Urządzenie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Rozdzielczość</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Urządzenie Wyjściowe</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Urządzenie Wejściowe</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>dodaj nowe konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importuj</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Wyeksportuj</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Uruchom Ring przy Starcie</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nowe konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Czy na pewno chcesz usunąć całą twoją historię?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Różne metody kontaktu&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Akceptuj</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blokuj</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Forma</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Konfiguracja</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>O</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Nie znaleziono domyślnego klienta poczty</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>konto Ring</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Automatycznie</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Forma</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>TekstEtykieta</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Dołącz Do Rozmów</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Etykieta Nazwiska</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Dodaj do kontaku</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Czas się skończył</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Podziel się obszarem ekranu</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Podziel się obszar ekranu</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Podziel się plikiem</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Proszę poczekaj aż stworzymy twoje konto.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Nieznane</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Połącz to urządzenie z kontem</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Stwórz swój profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Stwórz konto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Wybierz swoją nazwę użytkownika:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Wybierz swoją nazwę użytkownika</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Zarejestruj publiczną nazwę użytkownika (eksperymentalne)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Hasło</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Potwierdź hasło</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Generowanie twojego konta Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 e37ab21..60c33c8 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pl_PL" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopiuj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation type="unfinished"/>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -712,17 +783,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 d926f18..b773bde 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Pseudônimo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Nome do host</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Número do correio de voz</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Chamadas respondias automaticamente</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP habilitado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>A sessão expira em (segundos):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Igual aos parâmetros locais</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Defina endereço e porta:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Negociação de criptografia (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Certificado CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Certificado do usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Chave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Senha da chave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Verificar certificados de entrada (servidor)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Verificar certificados de resposta (cliente)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Exige certificado para conexões TLS</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Use cifras padrão</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Conversas</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>O Ring é uma plataforma de comunicação por voz, vídeo e texto, distribuída e segura que não requer servidor centralizado, garantindo poder e privacidade nas mãos dos usuários.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Chamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Vídeo</translation>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation type="unfinished"/>
     </message>
@@ -712,17 +783,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nova Conta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Compartilhar tela</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Anexar arquivo</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>Desconhecido</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Gerando sua conta Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 68c634a..a53490e 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="pt_BR" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Créditos</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Versão : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>O cliente Microsoft Windows para Ring
 Ring é um software de comunicação distribuído e seguro.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Ring Windows</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>versão</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Criado por:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Artwork por:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Baseado no projeto SFLPhone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Geral</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tipo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Apelido</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parâmetros</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Servidor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Nome de usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Senha</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>Excluir conta</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Número do correio de voz</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Chamadas de Auto-Resposta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP ativado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Tipo de tom DTMF</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Aceitar Chamada de Desconhecido</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Aceitar Chamada de Contato</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Aceitar Chamada de Histórico</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>URL do servidor</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Configurações de Conta do Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Selecionar toque</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Reproduzir</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Áudio/Vídeo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Codecs de Áudio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Codecs de Vídeo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avançado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registro</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tempo de expiração de registro (segundos):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Interface de Rede</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Porta Local:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Igual aos parâmetros locais</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Configurar endereço e portas publicadas:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Endereço</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Porta</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Usar STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL do servidor</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Usar TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Domínio</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Negociação de sessão SDP ( ICE Fallback)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Variação de portas de audio RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Máx</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Intervalo de portas de Video RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Segurança</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Criptografia de Fluxo de Mídia (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Dispositivos</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Adicionar dispositivo</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Exportar no Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Seu PIN gerado:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Encriptar fluxo de mídia (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Negociação de encriptação</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Endereço publicado</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Negociação de encriptação(TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>Certificado de CA</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Certificado de usuário</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Chave Privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Senha de chave privada</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Verificar certificados de saída (lado do servidor)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Verificar certificados de entrada (lado do cliente)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Exigir certificado para conexões TLS de entrada</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Utilizar cifras padrão</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Pausar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Escolher Arquivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Arquivos (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Senha Incorreta.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>ou digite um número...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Busque por contatos ou insira o RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Conversas</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Solicitações de contatos</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>menu de configurações</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>O Ring é uma plataforma de comunicação segura e distribuída para voz, vídeo e conversa que não necessita de servidor centralizado, deixando o poder da privacidade nas mãos do usuário. </translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Esse é seu RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copie e compartilhe-o com seus amigos!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Compartilhar seu RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Duplo clique para copiar.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Erro ao gerar o QRCode</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Conversar com</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Comece uma conversa!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>enviar mensagem</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Quer conversar com você!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Resposta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Chamando</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Chamar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Adicionar a contato</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Compartilhar por e-mail</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Encontre-me no Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Meu RingID é : </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Mostrar QRCode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Copiar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Exibir data</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Exibir autor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Recebendo mensagem de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Copiar nome</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Chamar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Copiar %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Ligar para %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>Nenhuma conta Ring entrada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Recebendo chamada de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Conversa com %1</translation>
@@ -618,6 +684,11 @@
         <translation>Manter minimizado ao fechar</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Vídeo</translation>
@@ -648,62 +719,62 @@
         <translation>Sempre gravar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Verificar atualizações automaticamente a cada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dias</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Verificar atualizações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Pré-visualização não disponível em chamadas</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Seleção de dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Dispositivo</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Resolução</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Dispositivo de saída</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Dispositivo de entrada</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>adicionar nova conta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exportar</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Conta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Iniciar ao ligar o Ring</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nova conta</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <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>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Vários métodos de contato&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Aceitar</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Bloquear</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formulário</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Cancelar</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Cliente de e-mail não encontrado</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Conta Ring</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Diálogo</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Automático</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulário</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>Rótulo do Texto </translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Juntar chamadas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Nome do rótulo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Adicionar a contato</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Tempo decorrido</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Compartilhar tela inteira</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Compartilhar área da tela</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Compartilhar arquivo</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Por favor aguarde enquanto nós criamos sua conta.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Desconhecido</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Associar este dispositivo a uma conta</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Criar um Perfil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Criar uma conta</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Escolha seu nome de usuário:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Escolha seu nome de usuário</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Registrar usuário público (experimental)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Entre o seu pin</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Senha</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Confirmar senha</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Criando sua conta Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Anterior</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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
new file mode 100644
index 0000000..3df9db4
--- /dev/null
+++ b/translations/ring_client_windows_ro.ts
@@ -0,0 +1,1323 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ro" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation>Credite</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation>Setari</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <source>Hostname</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <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"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>Redare</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation>Avansat</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <source>Audio RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
+        <source>Min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation>Seuritate</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <source>Search contacts or enter ring ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Solicitări de contact</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation>Sună</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation>Setari</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation>General</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>Nume</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation>Suna</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation>Necunoscut</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Confirmă parola</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+</TS>
\ No newline at end of file

translations/ring_client_windows_ru.ts

diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index dd5ae1c..a3c12cc 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Благодарности</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Клиент Ring для Windows.
 Ring – это приложение для безопасного и распределённого общения. </translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Клиент Ring для Windows</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>версия</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Авторы проекта:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Дизайн:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Основано на проекте SFLPhone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Общий</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
-        <translation>Учетная запись</translation>
+        <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Прозвище</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Имя компьютера</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Номер голосовой почты</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Автоответ звонков</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP разрешен</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Тип тона DTMF</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Разрешать звонки от незнакомых</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Разрешать звонки от лиц из списка контактов</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Разрешать звонки от лиц из истории</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
-        <source>Ring Account Settings</source>
-        <translation>Настройки учетной записи Ring</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="772"/>
-        <source>Ringtone Selection</source>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Адрес сервиса имён</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation>Настройки аккаунта Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation>Выбор мелодии звонка</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Играть</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Звук/Видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation>Аудио кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation>Видео кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Регистрация истекает через (секунды):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Сетевой интерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Локальный порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Такие же, как и локальные параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
-        <translation>Установить опубликованный адрес как порт</translation>
+        <translation>Установить публикуемый адрес и порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Исполльзовать STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Адрес сервера</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Использовать TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
-        <translation>область </translation>
+        <translation>Область </translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Согласование сесcии SDP (резерв ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Диапазон портов для RTP аудио</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Минимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Максимум</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Диапазон портов для RTP видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
+        <translation>Шифрование медиапотока (SRTP)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Устройства</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Добавить устройство</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Экспорт в сеть Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Ваш сгенерированный PIN:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>ОК</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Шифровать медиапотоки (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Шифрование разговора</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
-        <translation>Опубликованный адрес</translation>
+        <translation>Публикуемый адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Шифровать разговор (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
-        <translation>CA сертификат</translation>
+        <translation>Сертификат удостоверяющего центра</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Пользовательский сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
-        <translation>Приватный ключ</translation>
+        <translation>Закрытый ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
-        <translation>Пароль к приватному ключу</translation>
+        <translation>Пароль к закрытому ключу</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Проверять входящие сертификаты (на стороне сервера)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Проверять исходящие сертификаты (клиент)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Требует сертификат для входящих TLS соединений</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Использовать шифрование по-умолчанию</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Неверный пароль.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>или введите номер...</translation>
@@ -390,184 +455,185 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
+        <translation>Найдите контакты или введите Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Разговоры</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Запросы на добавление в контакты</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
-        <translation type="unfinished"/>
+        <translation>меню настроек</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring - это распределенная и безопасная платформа для передачи голоса, видео и текстовых сообщений, которая не нуждается в централизованном сервере и оставляет мощь секретности в руках пользователя.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Это ваш RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Скопируйте и поделитесь им с друзьями!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation type="unfinished"/>
+        <translation>Поделитесь вашим Ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Кликните дважды, чтобы скопировать.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
+        <translation>Ошибка при создании QR кода</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
-        <translation type="unfinished"/>
+        <translation>Разговор с</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
-        <translation type="unfinished"/>
+        <translation>Начните разговор!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
+        <translation>отправить сообщение</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
+        <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Ответить</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Звонок</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Копировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Добавить в контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <translation>Свяжись со мной в Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation>Мой Ring ID:</translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="212"/>
-        <source>My RingId is : </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Отображать дату</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Отображать имя</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>Сообщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Копировать имя</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
-        <translation type="unfinished"/>
+        <translation>Позвонить по номеру</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
-        <translation type="unfinished"/>
+        <translation>Копировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
-        <translation type="unfinished"/>
+        <translation>Копировать %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
-        <translation type="unfinished"/>
+        <translation>Позвонить %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
-        <translation>НЕ НАЙДЕНА УЧЕТНАЯ ЗАПИСЬ RING</translation>
+        <translation>НЕ НАЙДЕН АККАУНТ RING</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>Звонок от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
-        <translation type="unfinished"/>
+        <translation>Разговор с %1</translation>
     </message>
 </context>
 <context>
@@ -580,12 +646,12 @@
     <message>
         <location filename="../configurationwidget.ui" line="100"/>
         <source>General</source>
-        <translation>Общий</translation>
+        <translation>Общее</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="171"/>
         <source>quit settings menu</source>
-        <translation type="unfinished"/>
+        <translation>выйти из меню настроек</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="331"/>
@@ -618,6 +684,11 @@
         <translation>Сворачивать вместо закрытия</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Видео</translation>
@@ -635,115 +706,107 @@
     <message>
         <location filename="../configurationwidget.ui" line="506"/>
         <source>Record Settings</source>
-        <translation type="unfinished"/>
+        <translation>Настройки записи</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="539"/>
         <source>Save in :</source>
-        <translation type="unfinished"/>
+        <translation>Сохранить в:</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="582"/>
         <source>Always Record</source>
+        <translation>Всегда записывать</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
+        <translation>Проверять обновления автоматически каждые</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
+        <translation>Предпросмотр недоступен во время звонка</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Выбор устройства</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Разрешение</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation type="unfinished"/>
+        <translation>Устройство вывода</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation type="unfinished"/>
+        <translation>Устройство ввода</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
-        <translation type="unfinished"/>
+        <translation>добавить новый аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>Экспорт</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="132"/>
         <source>Account</source>
-        <translation>Учетная запись</translation>
+        <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Запускать Ring при старте системы</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
-        <translation>Новая учетная запись</translation>
+        <translation>Новый аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Вы уверены, что хотите удалить всю историю? </translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
         <source>Choose Directory</source>
-        <translation type="unfinished"/>
+        <translation>Выбрать папку</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="409"/>
         <source>An error occured while importing account.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>Множественные методы связи</translation>
+        <translation>Во время импортирования аккаунта произошла ошибка.</translation>
     </message>
 </context>
 <context>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Принять</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Заблокировать</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ok</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Настройка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
@@ -830,7 +972,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="26"/>
         <source>Path</source>
-        <translation type="unfinished"/>
+        <translation>Путь</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="46"/>
@@ -840,7 +982,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>Ok</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
@@ -850,18 +992,18 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation type="unfinished"/>
+        <translation>Сохранить файл</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>Файлы архива Ring (*.ring)</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>Открыть файл</translation>
     </message>
 </context>
 <context>
@@ -869,17 +1011,17 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation type="unfinished"/>
+        <translation>Фотобудка</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="58"/>
         <source>or</source>
-        <translation type="unfinished"/>
+        <translation>или</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="71"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>Импорт</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
@@ -897,32 +1039,43 @@
     <message>
         <location filename="../utils.cpp" line="185"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation>Не найден почтовый клиент по умолчанию</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Аккаунт Ring</translation>
     </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
-        <translation type="unfinished"/>
+        <translation>Авто</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -931,12 +1084,12 @@
     <message>
         <location filename="../videooverlay.ui" line="42"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation>Звонок приостановлен</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="119"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation>Приостановить / Возобновить</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="154"/>
@@ -946,45 +1099,45 @@
     <message>
         <location filename="../videooverlay.ui" line="186"/>
         <source>Add person to call</source>
-        <translation type="unfinished"/>
+        <translation>Добавить человека к звонку</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="218"/>
         <source>Transfer call</source>
-        <translation type="unfinished"/>
+        <translation>Передать звонок</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="256"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation>Выключить микрофон</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="367"/>
         <source>Quality</source>
-        <translation type="unfinished"/>
+        <translation>Качество</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="399"/>
         <source>Join Calls</source>
-        <translation type="unfinished"/>
+        <translation>Присоединиться к звонкам</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>Имя</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Добавить в контакт</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
-        <translation type="unfinished"/>
+        <translation>Прошло времени</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Транслировать весь экран</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Транслировать область экрана</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Поделиться файлом</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Подождите, пока идет создание учетной записи.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Привязать это устройство к аккаунту</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Создайте свой профиль</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Создайте свой аккаунт</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Выберите имя пользователя:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Выберите ваше имя пользователя</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Зарегистрировать публичное имя (экспериментальная функция)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Введите ваш PIN</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Подтвердить пароль</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Создание вашего аккаунта Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Назад</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 2c109a2..a278592 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="ru_RU" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Кредиты</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Релиз: : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows клиент для Ring.
 Ring защищенное и распределенное программное обеспечение</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>Версия</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Это ваш RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Скопировать и поделиться с друзьями!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Основные</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Учетная запись</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Псевдоним</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Параметры</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Узел</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Пользователь</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>Удалить учетную запись</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Прокси</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Номер голосовой почты</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Автоответчик</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Аудио/видео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Дополнительно</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Регистрация</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Время истечения регистрации в секундах:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Сетевой интерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Аналогично локальным параметрам</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Установить публичный адрес и порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Использовать STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Использовать TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Область</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Диапазон портов RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Мин</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Макс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Безопасность</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Отмена</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Публичный адрес</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA сертификат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Сертификат пользователя</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Приватный ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Пароль приватного ключа</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Выбрать файл</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Файлы(*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation type="unfinished"/>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Введите имя контакта или его ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Беседы</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Это Ваш Ring ID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Скопируйте его и поделитесь с вашим друзьями!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Поделиться вашим RingID.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Щёлкните дважды, чтобы скопировать.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Разговор с</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Начать разговор !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>Отправить сообщение</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Хочет поговорить с вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Ответ</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>звонящий</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Звонок</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Скопировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Добавить в контакты</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Поделиться по email</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Мой RingId:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Показать QRCode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Копировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Показать дату</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Показать автора</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Входящее сообщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Скопировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Копировать %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Вызов %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>УЧАТНАЯ ЗАПИСЬ RING НЕ НАЙДЕНА</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Входящий вызов от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Разговор с %1</translation>
@@ -618,6 +684,11 @@
         <translation>Оставлять свернутым при закрытии</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Видео</translation>
@@ -648,62 +719,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Проверять обновления каждые</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>дней</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Проверить обновления</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Устройство</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Разрешение</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>добавить новую учетную запись</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Импорт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Экспорт</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Учетная запись</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Новая учетная запись</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Вы уверены что хотите удалить история поиска?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Принять</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Отмена</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Да</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Звонок</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Настройка</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>О продукте</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Не найден почтовый клиент используемый по умолчанию</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Диалог</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Автоматически</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>Текстовая метка</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Добавить в контакты</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Прошедшее время</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Общий доступ к экрану</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Поделится файлом</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Пожалуйста  подождите пока мы создаем вашу учетную запись.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Неизвестно</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Выберите ваше имя пользователя:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Выберите ваше имя пользователя</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Подтвердите пароль</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Создать вашу учетную запись Ring</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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
new file mode 100644
index 0000000..4930678
--- /dev/null
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -0,0 +1,1323 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sk_SK" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation>O programe</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation>Nastavenie</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation>Účet</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <source>Hostname</source>
+        <translation>Hostname</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <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"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation>UPnP zapnuté</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>Spusť</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation>Registrácia</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation>Port</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <source>Audio RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
+        <source>Min</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Zariadenia</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Pridaj zariadenie</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Zruš</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>Ok</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation>Vyber súbor</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation>Súbory (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation>Prenos</translation>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <source>Search contacts or enter ring ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation>Odpoveď</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation>Volanie</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation>Zruš</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation>Volaj</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation>Kopíruj</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation>Nastavenie</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation>Všeobecné</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation>Nastavenia historie</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>Názov</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation>Zariadenie</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation>Vytvor</translation>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Zruš</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation>Kopíruj</translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation>Ring</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation>Konfigurácia</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation>O programe</translation>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation>Zruš</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation>Vyber súbor</translation>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation>Súbory (*)</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation>Neznámy</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>Ďalej</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

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
new file mode 100644
index 0000000..8db2403
--- /dev/null
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -0,0 +1,1324 @@
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sq_AL" version="2.0">
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../aboutdialog.ui" line="435"/>
+        <location filename="../aboutdialog.ui" line="462"/>
+        <source>About</source>
+        <translation>Mbi</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="475"/>
+        <source>Credits</source>
+        <translation>Kredite</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="557"/>
+        <source>The Microsoft Windows client for Ring.
+Ring is a secured and distributed communication software.</source>
+        <translation>Klienti Ring për Microsoft Windows.
+Ring-u është një software komunikimesh të siguruara dhe të shpërndara.</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="30"/>
+        <source>version</source>
+        <translation>version</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="37"/>
+        <source>Created by:</source>
+        <translation>Krijuar nga:</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="67"/>
+        <source>Artwork by:</source>
+        <translation>Përkujdesja grafike:</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.cpp" line="71"/>
+        <source>Based on the SFLPhone project</source>
+        <translation>Bazuar në projektin SFLPhone</translation>
+    </message>
+</context>
+<context>
+    <name>AccountDetails</name>
+    <message>
+        <location filename="../accountdetails.ui" line="23"/>
+        <source>Settings</source>
+        <translation>Rregullime</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="63"/>
+        <source>General</source>
+        <translation>Të përgjithshme</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="137"/>
+        <source>Account</source>
+        <translation>Llogari</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="197"/>
+        <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"/>
+        <source>Parameters</source>
+        <translation>Parametra</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="271"/>
+        <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.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"/>
+        <source>Password</source>
+        <translation>Krijoni llogari</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="488"/>
+        <source>Proxy</source>
+        <translation>Ndërmjetës</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="528"/>
+        <source>Voicemail number</source>
+        <translation>Numër voicemail</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="562"/>
+        <source>Auto-answer calls</source>
+        <translation>Vetëpërgjigju thirrjeve</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="580"/>
+        <source>UPnP enabled</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="638"/>
+        <source>Allow Call From Unknown</source>
+        <translation>Lejo Thirrje Prej të Panjohurish</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="665"/>
+        <source>Allow Call From Contact</source>
+        <translation>Lejo Thirrje Prej Kontaktesh</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="653"/>
+        <source>Allow Call From History</source>
+        <translation>Lejo Thirrje Prej Historiku</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
+        <source>Ring Account Settings</source>
+        <translation>Rregullime Llogarie Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="701"/>
+        <source>Ringtone Selection</source>
+        <translation>Përzgjedhje Zileje</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
+        <source>Play</source>
+        <translation>Luaje</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="785"/>
+        <source>Audio/Video</source>
+        <translation>Audio/Video</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1001"/>
+        <source>Audio codecs</source>
+        <translation>Kodekë audio</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1031"/>
+        <source>Video codecs</source>
+        <translation>Kodekë video</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1048"/>
+        <source>Advanced</source>
+        <translation>Të mëtejshme</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1094"/>
+        <source>Registration</source>
+        <translation>Regjistrim</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1114"/>
+        <source>Registration expire timeout (seconds):</source>
+        <translation>Kohë skadimi regjistrimi (në sekonda):</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1152"/>
+        <source>Network Interface</source>
+        <translation>Ndërfaqe Rrjeti</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1173"/>
+        <source>Local Port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1277"/>
+        <source>Same as local parameters</source>
+        <translation>Njësoj si parametrat vendorë</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1298"/>
+        <source>Set published address and port:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1324"/>
+        <source>Address</source>
+        <translation>Adresë</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1355"/>
+        <source>Port</source>
+        <translation>Portë</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1409"/>
+        <source>Use STUN</source>
+        <translation>Përdor STUN</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
+        <source>Server URL</source>
+        <translation>URL Shërbyesi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1450"/>
+        <source>Use TURN</source>
+        <translation>Përdor TURN</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1517"/>
+        <source>Realm</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1566"/>
+        <source>SDP Session Negotiation (ICE Fallback)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1594"/>
+        <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"/>
+        <source>Audio RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
+        <source>Min</source>
+        <translation>Min.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
+        <source>Max</source>
+        <translation>Maks.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1770"/>
+        <source>Video RTP Port Range</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1896"/>
+        <source>Security</source>
+        <translation>Siguri</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2115"/>
+        <source>Media Stream Encryption (SRTP)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Pajisje</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Anuloje</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </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>Adresë e Publikuar</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1961"/>
+        <source>CA certificate</source>
+        <translation>Dëshmi AD</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="1998"/>
+        <source>User certificate</source>
+        <translation>Dëshmi përdoruesi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2032"/>
+        <source>Private key</source>
+        <translation>Kyç privat</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2047"/>
+        <source>Private key password</source>
+        <translation>Fjalëkalim kyçi privat</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2127"/>
+        <source>Use default ciphers</source>
+        <translation>Përdor shifër parazgjedhje</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="55"/>
+        <source>Pause</source>
+        <translation>Pushim</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
+        <source>Choose File</source>
+        <translation>Zgjidhni Kartelë</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation>Kartela (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallUtilsDialog</name>
+    <message>
+        <location filename="../callutilsdialog.ui" line="65"/>
+        <source>or type number...</source>
+        <translation>ose shtypni një numër…</translation>
+    </message>
+    <message>
+        <location filename="../callutilsdialog.ui" line="104"/>
+        <source>Transfer</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CallWidget</name>
+    <message>
+        <location filename="../callwidget.ui" line="213"/>
+        <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"/>
+        <source>Conversations</source>
+        <translation>Biseda</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
+        <source>settings menu</source>
+        <translation>menu rregullimesh</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="659"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kjo është RingID-ja juaj.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kopjojeni dhe jepuani shokëve!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="763"/>
+        <source>Share your ring id</source>
+        <translation>Ndani me të tjerët ID-në tuaj Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="866"/>
+        <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Dyklikoni që të kopjohet.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="895"/>
+        <source>Error while generating QR Code</source>
+        <translation>Gabim teksa prodhohej kodi QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation>Bisedë me</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
+        <source>Start the conversation !</source>
+        <translation>Filloni bisedën!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1264"/>
+        <source>send message</source>
+        <translation>dërgo mesazh</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
+        <source>Wants to talk to you!</source>
+        <translation>Dëshiron të bisedojë me ju!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1495"/>
+        <source>Answer</source>
+        <translation>Përgjigjuni</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1527"/>
+        <source>Ignore</source>
+        <translation>Shpërfille</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1598"/>
+        <source>Calling</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1671"/>
+        <source>Cancel</source>
+        <translation>Anuloje</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1380"/>
+        <source>Call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="279"/>
+        <source>Copy number</source>
+        <translation>Kopjoje numrin</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="290"/>
+        <source>Add to contact</source>
+        <translation>Shtoje te kontakti</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>Contact me on Ring</source>
+        <translation>Kontaktomëni në Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation>RingID-ja ime është:</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="212"/>
+        <source>Copy</source>
+        <translation>Kopjoje</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="222"/>
+        <source>Display date</source>
+        <translation>Shfaq datën</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="226"/>
+        <source>Display author</source>
+        <translation>Shfaq autorin</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="255"/>
+        <source>Message incoming from %1</source>
+        <translation>Mesazh ardhës nga %1</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Kopjo emrin</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
+        <source>Call Number</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="301"/>
+        <source>Copy Number</source>
+        <translation>Kopjoje Numrin</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="304"/>
+        <source>Copy %1</source>
+        <translation>Kopjoje %1</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="309"/>
+        <source>Call %1</source>
+        <translation>Thirr %1</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="749"/>
+        <source>NO RING ACCOUNT FOUND</source>
+        <translation>S’U GJET LLOGARI RING</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="414"/>
+        <source>Call incoming from %1</source>
+        <translation>Thirrje ardhur nga %1</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="784"/>
+        <source>Conversation with %1</source>
+        <comment>%1 is the contact name</comment>
+        <translation>Bisedë me %1</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigurationWidget</name>
+    <message>
+        <location filename="../configurationwidget.ui" line="20"/>
+        <source>Settings</source>
+        <translation>Rregullime</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="100"/>
+        <source>General</source>
+        <translation>Të përgjithshme</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="171"/>
+        <source>quit settings menu</source>
+        <translation>dil nga menu rregullimesh</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="331"/>
+        <source>History Settings</source>
+        <translation>Rregullime Historiku</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="372"/>
+        <source>Keep History for (days)</source>
+        <translation>Historikun mbaje për (ditë)</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="415"/>
+        <source>(Set to 0 for unlimited history)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="469"/>
+        <source>Clear History</source>
+        <translation>Pastroje Historikun</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="615"/>
+        <source>Misc. Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="637"/>
+        <source>Keep minimized on close</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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"/>
+        <source>Profile</source>
+        <translation>Profil</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="299"/>
+        <source>Name</source>
+        <translation>Emër</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="506"/>
+        <source>Record Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="539"/>
+        <source>Save in :</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="582"/>
+        <source>Always Record</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
+        <source>Check for update automatically every</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="736"/>
+        <source>days</source>
+        <translation>ditë</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="888"/>
+        <source>Preview unavailable during call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="942"/>
+        <source>Device Selection</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1000"/>
+        <source>Device</source>
+        <translation>Pajisje</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1031"/>
+        <source>Resolution</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1068"/>
+        <source>Output Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1083"/>
+        <source>Input Device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1180"/>
+        <source>add new account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1242"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="1249"/>
+        <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"/>
+        <source>Launch Ring on Startup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="310"/>
+        <source>New Account</source>
+        <translation>Llogari e Re</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="330"/>
+        <source>Are you sure you want to clear all your history?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="379"/>
+        <source>Choose Directory</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.cpp" line="409"/>
+        <source>An error occured while importing account.</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>ContactPicker</name>
+    <message>
+        <location filename="../contactpicker.ui" line="33"/>
+        <source>Existing Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="43"/>
+        <source>Search...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="56"/>
+        <source>Create new contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="75"/>
+        <source>New Contact</source>
+        <translation>Kontakt i Ri</translation>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="98"/>
+        <source>Enter a name here...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactpicker.ui" line="128"/>
+        <source>Create</source>
+        <translation>Krijoje</translation>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Pranoje</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Anuloje</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
+    <name>InstantMessagingWidget</name>
+    <message>
+        <location filename="../instantmessagingwidget.ui" line="71"/>
+        <source>Send text message...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="46"/>
+        <source>Copy</source>
+        <translation>Kopjoje</translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="52"/>
+        <source>Display date</source>
+        <translation>Shfaq datën</translation>
+    </message>
+    <message>
+        <location filename="../instantmessagingwidget.cpp" line="56"/>
+        <source>Display author</source>
+        <translation>Shfaq autorin</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Ring</source>
+        <translation>Ring</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="53"/>
+        <source>Configuration</source>
+        <translation>Formësim</translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="56"/>
+        <source>Exit</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../mainwindow.cpp" line="80"/>
+        <source>About</source>
+        <translation>Mbi</translation>
+    </message>
+</context>
+<context>
+    <name>PathPasswordDialog</name>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="26"/>
+        <source>Path</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="46"/>
+        <source>Password</source>
+        <translation>Krijoni llogari</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="65"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.ui" line="72"/>
+        <source>Cancel</source>
+        <translation>Anuloje</translation>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="60"/>
+        <source>Save File</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="62"/>
+        <location filename="../pathpassworddialog.cpp" line="67"/>
+        <source>Ring archive files (*.ring)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../pathpassworddialog.cpp" line="65"/>
+        <source>Open File</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>PhotoBoothDialog</name>
+    <message>
+        <location filename="../photoboothdialog.ui" line="14"/>
+        <source>Photobooth</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="58"/>
+        <source>or</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.ui" line="71"/>
+        <source>Import</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="59"/>
+        <source>Choose File</source>
+        <translation>Zgjidhni Kartelë</translation>
+    </message>
+    <message>
+        <location filename="../photoboothdialog.cpp" line="61"/>
+        <source>Files (*)</source>
+        <translation>Kartela (*)</translation>
+    </message>
+</context>
+<context>
+    <name>QObject</name>
+    <message>
+        <location filename="../utils.cpp" line="185"/>
+        <source>No default mail client found</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Llogari Ring</translation>
+    </message>
+</context>
+<context>
+    <name>QualityDialog</name>
+    <message>
+        <location filename="../qualitydialog.ui" line="100"/>
+        <source>Auto</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>SendContactRequestWidget</name>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>VideoOverlay</name>
+    <message>
+        <location filename="../videooverlay.ui" line="42"/>
+        <source>Call on Hold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="119"/>
+        <source>Hold / Unhold</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="154"/>
+        <source>Chat</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="186"/>
+        <source>Add person to call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="218"/>
+        <source>Transfer call</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="256"/>
+        <source>Mute Mic</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="367"/>
+        <source>Quality</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="399"/>
+        <source>Join Calls</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="490"/>
+        <source>Name label</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="512"/>
+        <source>Add to contact</source>
+        <translation>Shtoje te kontakti</translation>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="582"/>
+        <source>Time elapsed</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="585"/>
+        <source>00:00</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="87"/>
+        <source>Hangup</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videooverlay.ui" line="297"/>
+        <source>Mute Video</source>
+        <translation>Hiqi Zërin Videos</translation>
+    </message>
+</context>
+<context>
+    <name>VideoView</name>
+    <message>
+        <location filename="../videoview.cpp" line="235"/>
+        <source>Share entire screen</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
+        <source>Share file</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>WizardDialog</name>
+    <message>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
+        <source>Unknown</source>
+        <translation>E panjohur</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Lidheni këtë pajisje me një llogari</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Krijoni profilin tuaj</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Krijoni llogarinë tuaj</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
+        <source>Choose your username:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Regjistroni emër përdoruesi publik (eksperimentale)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Fjalëkalim</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Ripohoni fjalëkalimin</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>Pasuesi</translation>
+    </message>
+</context>
+</TS>
\ No newline at end of file

translations/ring_client_windows_sv.ts

diff --git a/translations/ring_client_windows_sv.ts b/translations/ring_client_windows_sv.ts
index b36c647..b55e0c4 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="sv" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Tack till</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Publicering : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation>Release : Beta 2 - Gaston Miron</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows-klient för Ring.
 Ring är säker och distribuerad kommunikationsmjukvara.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>version</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Skapad av:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Bildkonst av:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Baserad på SFLPhone-projektet</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Allmänt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Typ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Alias</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Parametrar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Värdnamn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Lösenord</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>ta bort konto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Nummer till röstbrevlåda</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Besvara samtal automatiskt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP aktiverad</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>DTMF-tontyp</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Tillåt samtal från okända</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Tillåt samtal från kontakt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Tillåt samtal från historik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation>Offentligt användarnamn</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation>Registrering i blockkedjan</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Namntjänst-URL</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ring-kontoinställningar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Ringsignaler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Spela</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Ljud/Video</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Ljudkodekar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Videokodekar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Avancerat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Registrering</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Tidsgräns för registrering (sekunder):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Nätverksgränssnitt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Lokal port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Samma som lokala parametrar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Ange publicerad adress och port:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adress</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Port</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Använd STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Serveradress</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Använd TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Område</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP sessionsförhandling (ICE-reserv)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Audio RTP portintervall</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Min</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Max</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Video RTP portintervall</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Säkerhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Mediaströmkryptering (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Enheter</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Lägg till enhet</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation>Lösenord (obligatoriskt)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Export på Ring</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Din PIN-kod:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation>PIN-kod</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Förhandlingskryptering</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Publiserad adress</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Kryptera förhandling (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA-certificat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Användarcertifikat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Privat nyckel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Lösenord för privat nyckel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Verifiera inkommande certifikat (serversidan)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Verifiera svarscertifikat (klientsidan)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Kräv certifikat för inkommande TLS-anslutningar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Använd standardshiffer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Paus</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>Ring-ID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Välj fil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation>Vänta medan din PIN-kod genereras.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation>Nätverksfel. Försök igen senare.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Fel lösenord.</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation>Registrerar... det kan ta lite tid.</translation>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Formulär</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation>Bannlyst ID</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation>Ta bort bannlysningen för kontakten, och lägg till i kontaktlistan</translation>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>eller ange nummer...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Formulär</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Sök kontakter eller ange Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Konversationer</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>Kontaktförfrågningar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>inställningsmeny</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring är en säker och distribuerad plattform för röst-, video- och chattkommunikation, som inte kräver någon central server och som lägger kontrollen över integritet och privatliv i användarens händer.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Detta är ditt Ring-ID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kopiera och dela det med dina vänner!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Dela ditt Ring-ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Dubbelklick för att kopiera.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <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="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation>kontaktförfrågan</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Konversation med</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Starta konversationen!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>Skicka meddelande</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation>Best-ID</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Vill prata med dig!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Svara</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ignorera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Ringer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Ring upp</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Kopiera nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Lägg till kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Dela via e-post</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Kontakta mig på Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Mitt Ring-ID är:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Visa QR-kod</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopiera</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Visa datum</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Visa deltagare</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Inkommande meddelande från %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Kopiera namn</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Ring upp nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Kopiera nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopiera %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Ring %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>INGET RING-KONTO HITTADES</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Inkommande samtal från %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Konversation med %1</translation>
@@ -618,6 +684,11 @@
         <translation>Minimera istället för att avsluta</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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>
@@ -648,62 +719,62 @@
         <translation>Spela alltid in</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation>Aktivera aviseringar</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Sök efter uppdateringar varje</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>dagar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Sök efter uppdateringar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Förhandsvisa otillgängliga under samtal</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Enheter</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Enhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Upplösning</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Utdataenhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Indataenhet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>Lägg till nytt konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Importera</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Exportera</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Starta Ring vid systemstart</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Nytt konto</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Vill du verkligen rensa bort all din historik?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Flera kontaktmetoder&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Formulär</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation>Inkommande kontaktförfrågan</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation>Namnetikett</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation>Best-ID-etikett</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Acceptera</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation>Ta bort</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Blockera</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Formulär</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation>Ring - kontoborttagning</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation>Vill du verkligen ta bort kontot?</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation>Denna åtgärd kan inte ångras</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>Om detta konto inte har exporterats eller lagts till i en annan enhet, kommer det att förloras</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>OK</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Ingen ordinarie e-postklient hittades</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring-konto</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Dialog</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Auto</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Formulär</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>Textetikett</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation>Kontakt-ID</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation>TODO: Förklara syftet med en kontaktförfrågan</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation>Skicka kontaktförfrågan</translation>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Anslut till samtal</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Namnetikett</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <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="582"/>
         <source>Time elapsed</source>
         <translation>Förfluten tid</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Dela hela skärmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Dela skärmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Dela fil</translation>
     </message>
@@ -1020,23 +1173,159 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Vänta medan ditt konto skapas.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation>Ditt konto behöver migreras. Välj ett lösenord.</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation>Migrerar ditt Ring-konto...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Okänd</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <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="220"/>
+        <source>Add a device</source>
+        <translation>Lägg till en enhet</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation>Användarnamnet är inte tillgängligt.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation>Användarnamnet är tillgängligt.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation>Användarnamnet är ogiltigt.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation>Nätverksfel.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation>Skapa Ring-konto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Koppla denna enhet till ett konto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation>Hur man lägger till en enhet</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation>&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:&apos;Ubuntu&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-size:12pt;&quot;&gt;För att länka den här enheten till ett annat konto &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;måste du först skaffa en PIN-kod&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;. För att generera PIN-koden:&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-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;Gå till &lt;span style=&quot; font-weight:600;&quot;&gt;Kontohanteringsinställningarna&lt;/span&gt; på en tidigare enhet.&lt;/li&gt;
+&lt;li style=&quot; 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;Välj det &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-konto&lt;/span&gt; du vill använda&lt;/li&gt;
+&lt;li style=&quot; 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;Gå till &lt;span style=&quot; font-weight:600;&quot;&gt;Enhetsfliken&lt;/span&gt;&lt;/li&gt;
+&lt;li style=&quot; 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;Välj &lt;span style=&quot; font-weight:600;&quot;&gt;Lägg till en enhet&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-size:12pt;&quot;&gt;Där får du din obligatoriska PIN-kod för att komplettera detta formulär. Pin-koden är endast giltig i &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;10 minuter&lt;/span&gt;&lt;span style=&quot; 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="159"/>
+        <source>Create your profile</source>
+        <translation>Skapa din profil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation>Ange ditt fullständiga namn:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Skapa ditt konto</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Välj ditt användarnamn:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Välj användarnamn</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation>Söker...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Registrera ett offentligt namn (experimentellt)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Ange din PIN-kod</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Lösenord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Bekräfta lösenord</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Genererar ditt Ring-konto...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Föregående</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 36305b0..255480a 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="tr" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Krediler</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Dağıtım : Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation>Dağıtım: Beta 2 - Gaston Miron</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Microsoft Windows için Ring istemcisi.
-Ring güvenli ve dağıtık bir haberleşme yazılımıdır.</translation>
+Ring güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>sürüm</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Oluşturanlar:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Çizenler:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>SFLPhone tasarısı temel alınmıştır.</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Genel</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Hesap</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Tür</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Takma ad</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Değişkenler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Sunucu adı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Kullanıcı adı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Parola</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>hesabı sil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Vekil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
-        <translation>Sesli mesaj numarası</translation>
+        <translation>Sesli ileti numarası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
-        <translation>Aramaları otomatik cevapla</translation>
+        <translation>Aramaları kendiliğinden yanıtla</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP etkin</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>DTMF ton türü</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
-        <translation>Bilinmeyen Aramalara İzin Ver</translation>
+        <translation>Bilinmeyenden Aramaya İzin Ver</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
-        <translation>Kayıtlı kişilerden aramaya izin ver</translation>
+        <translation>Kişilerden Aramaya İzin Ver</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
-        <translation>Geçmişten aramaya izin ver</translation>
+        <translation>Geçmişten Aramaya İzin Ver</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation>Herkese açık kullanıcı adı</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation>Kayıt zinciri üzerinde kaydet</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>Ad hizmeti adresi</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ring Hesap Ayarları</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
-        <translation>Zil sesi Seçimi</translation>
+        <translation>Zil Sesi Seçimi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Oynat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Ses/Görüntü</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Ses çözücüleri</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Görüntü çözücüler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Gelişmiş</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Kaydolma</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Kaydolma bitimi zaman aşımı (saniye):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Ağ Arayüzü</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Yerel Delik:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Yerel değişkenlerle aynı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
-        <translation>Yayınlanan yeri ve deliği belirle:</translation>
+        <translation>Yayımlanan yeri ve deliği belirle:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Adres</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
-        <translation>Port</translation>
+        <translation>Delik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>STUN kullan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>Sunucu adresi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>TURN kullan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Yetki alanı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>SDP Görüşme Oturumu (ICE Geri çekilme)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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 sadece SDP oturum müzakeresi sırasında ICE&apos;ın sunucu ya da eş tarafından desteklenmemesi durumunda kullanılacaktır.</translation>
+        <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>RTP Ses Port Aralığı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Asgari</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Azami</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Görüntü RTP Delik Aralığı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Güvenlik</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Ortam Akışı Şifreleme (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>Aygıtlar</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>Aygıt ekle</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
+        <translation>Parola (gerekli)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Ring&apos;de Dışa Aktar</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>Oluşturulan pin&apos;iniz:</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation>PIN</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>TAMAM</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <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>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Müzakere Şifreleme</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
-        <translation>Yayınlanan Yer</translation>
+        <translation>Yayımlanan Yer</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Müzakereyi şifrele (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA sertifikası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Kullanıcı sertifikası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Özel anahtar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Özel anahtar parolası</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Gelen sertifikaları doğrula (sunucu tarafı)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Cevap sertifikalarını doğrula (istemci tarafı)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Gelen TLS bağlantıları için sertifika iste</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
-        <translation>Öntanımlı şifreyi kullan</translation>
+        <translation>Öntanımlı şifrelemeyi kullan</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Duraklat</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>Ring Kimliği</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Dosya Seç</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Dosyalar (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>Yanlış parola</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Karşılıklı konuşma</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>ya da numara girin...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
-        <translation>Kişileri ara veya Ring ID&apos;si gir</translation>
+        <translation>Kişileri ara veya Ring kimliği gir</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Konuşmalar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>İletişim istekleri</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>ayarlar menüsü</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring merkezi sunucuya ihtiyaç duymayan, gizliliğin gücünü kullanıcının ellerine bırakan, güvenli ve dağıtık; sesli, görüntülü ve yazılı iletişim platformudur.</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Bu sizin Ring ID&apos;niz.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Kopyalayın ve arkadaşlarınızla paylaşın!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation>Ring ID&apos;nizi paylaşın</translation>
+        <translation>Ring kimliğinizi paylaşın</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Kopyalamak için çift tıklayın.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>QR Kodu oluşturulurken hata</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
-        <source>Conversation with</source>
-        <translation>ile görüşme</translation>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1094"/>
+        <source>Conversation with</source>
+        <translation>Şununla konuşma</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Konuşmayı başlat !</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>ileti gönder</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Sizinle konuşmak istiyor!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
-        <translation>Cevapla</translation>
+        <translation>Yanıtla</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation>Gözardı et</translation>
+        <translation>Göz ardı et</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Aranıyor</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
-        <translation>Ar</translation>
+        <translation>Ara</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Numarayı kopyala</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Kişiye ekle</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>eposta ile paylaşın</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation>Ring ile benimle iletişime geç</translation>
+        <translation>Ring&apos;de benimle iletişime geç</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Ring kimliğim:</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>QR Kodu göster</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Kopyala</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Tarihi görüntüle</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Yazarı görüntüle</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>%1&apos;den gelen ileti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>Adı kopyala</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Telefon numarası</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Numarayı kopyala</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Kopyala %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Ara %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>RING HESABI BULUNAMADI</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>%1$s&apos;dan gelen arama</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>%1 ile konuşma</translation>
@@ -618,6 +684,11 @@
         <translation>Kapatırken küçültülmüş olarak tut</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <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>
@@ -645,65 +716,65 @@
     <message>
         <location filename="../configurationwidget.ui" line="582"/>
         <source>Always Record</source>
-        <translation>Herzaman Kayıt</translation>
+        <translation>Her Zaman Kaydet</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation>Bildirimleri etkinleştir</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
-        <translation>Güncellemeleri otomatik olarak denetle</translation>
+        <translation>Güncellemeleri kendiliğinden denetle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>gün</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Güncellemeleri denetle</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Arama sırasında önizleme mevcut değil</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Aygıt Seçimi</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation>Cihaz</translation>
+        <translation>Aygıt</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Çözünürlük</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation>Çıkış Cihazı</translation>
+        <translation>Çıkış Aygıtı</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation>Giriş Cihazı</translation>
+        <translation>Giriş Aygıtı</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>yeni hesap ekle</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>İçe aktar</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Dışa aktar</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Hesap</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Ring&apos;i başlangıçta çalıştır</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Yeni Hesap</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <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>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation>Gelen İletişim İsteği</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Kabul et</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation>Vazgeç</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>Engelleme</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Form</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation>Ring - hesap silinmesi</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation>Gerçekten hesabı silmek istiyor musunuz?</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation>Bu işlem geri alınamaz</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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>İptal</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Tamam</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Yapılandırma</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Çıkış</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Hakkında</translation>
     </message>
@@ -850,7 +992,7 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation>Dosyayı kaydet</translation>
+        <translation>Dosyayı Kaydet</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="62"/>
@@ -861,7 +1003,7 @@
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation>Dosyayı aç</translation>
+        <translation>Dosyayı Aç</translation>
     </message>
 </context>
 <context>
@@ -869,7 +1011,7 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation>Fotograf  kabini</translation>
+        <translation>Fotoğraf kabini</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="58"/>
@@ -879,7 +1021,7 @@
     <message>
         <location filename="../photoboothdialog.ui" line="71"/>
         <source>Import</source>
-        <translation>İçe aktar</translation>
+        <translation>İçe Aktar</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Varsayılan posta istemcisi bulunmadı</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring Hesabı</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Karşılıklı konuşma</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Kendiliğinden</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Form</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>MetinEtiketi</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation>İletişim isteği gönder</translation>
     </message>
 </context>
 <context>
@@ -931,7 +1084,7 @@
     <message>
         <location filename="../videooverlay.ui" line="42"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation>Çağrı Beklemede</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="119"/>
@@ -969,22 +1122,22 @@
         <translation>Çağrılara katıl</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>İsim etiketi</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Kişiye ekle</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Geçen zaman</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Tüm ekranı paylaş</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Ekran alanı paylaş</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Dosya paylaş</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Biz hesabınızı oluştururken lütfen bekleyin.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation>Ring hesabınız göç ettiriliyor...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Bilinmeyen</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation>Bir aygıt ekle</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation>Kullanıcı adı uygun değil</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation>Kullanıcı adı uygun</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation>Kullanıcı adı geçersiz.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation>Ağ hatası.</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation>Ring Hesabı Oluştur</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>Bu aygıtı bir hesaba bağla</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation>Bir aygıt nasıl eklenir</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>Profilinizi oluşturun</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation>Tam adınızı girin:</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>Hesabınızı oluşturun</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Kullanıcı adınızı seçin:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Kullanıcı adınızı seçin</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation>Arama yapılıyor...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>Halka açık kullanıcı adı kaydet (deneysel)</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation>Pin&apos;inizi girin</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Parola</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Parolayı onayla</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Ring hesabınız oluşturuluyor...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>Önceki</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 777ffe2..79f21f1 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="uk" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,39 +13,34 @@
         <translation>Подяки</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>Реліз: Луї-Жозеф Папінеу</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation>Клієнт Ring для Microsoft Windows.
 Ring - це безпечне і децентралізоване програмне забезпечення для спілкування</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation>Windows Ring</translation>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>версія</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation>Стоворено:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation>Намальовано:</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation>Базується на проекті SFLPhone</translation>
     </message>
@@ -53,330 +48,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>Головні</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>Тип</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>Додаткове ім’я</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>Параметри</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>Ім&apos;я хоста</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>Ім’я</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>Пароль</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>видалити акаунт</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Проксі</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>Номер голосової пошти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>Автоматично відповідати на дзвінки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP включено</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation>Тип DTMF</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation>RTP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation>SIP</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>Приймати дзвінки від невідомих контактів</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>Приймати дзвінки від контактів</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>Приймати дзвінки від контактів з історії</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Налаштування аккаунту Ring</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation>Вибір рингтону</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>Програти</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>Аудіо/Відео</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>Аудіо кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>Відео кодеки</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>Додаткові</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>Реєстрація</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation>Час придатності регістрації (секунди):</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>Мережевий інтерфейс</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation>Локальний порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>Аналогічно локальним налашуванням</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>Встановити оголошену адресу та порт:</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>Адреса</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>Порт</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>Використовувати STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation>URL серверу</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>Використовувати TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation>Оточення</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation>Погодження сесій SDP (резервування ICE)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>Порти для передачі аудіо по RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>Мінімально</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>Максимально</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation>Порти для передачі відео по RTP</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>Безпека</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>Шифрування медіа потоку (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>Відміна</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>Шифрувати потік (SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation>Шифрування розмови</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>Опублікована адреса</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation>Шифрування переговорів (TLS)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA сертифікат</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>Сертифікат користувача</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>Приватний ключ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>Пароль від приватного ключа</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation>Перевірити вхідні сертифікати(на стороні сервера)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation>Підтвердження сертифікатів безпеки (на стороні клієнта)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation>Вимагати сертифікат безпеки для вхідних TLS з’єднань</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>Використовувати шифрувальники за замовчуванням</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>Пауза</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>Вибрати файл</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>Файли (*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Діалог</translation>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>або введіть номер...</translation>
@@ -390,181 +455,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>Знайти контакти або ввести ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>Групові чати</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>налаштування меню</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation>Ring - це захищена платформа для здійснення голосових та відеозвінків, яка не потребує централізованого сервера й надає самим користувачам можливість забезпечувати приватність</translation>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Це ваше RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Зкопіювати та поділитися ним з ващими друзями!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>Поділитися вашим ring id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Подвійни клік для копіювання.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation>Помилка при генерації QR-коду</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation>Розмова з</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation>Почати розмову!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>віпдправити повідомлення</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>Хоче поговорити з вами!</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>Відповідь</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>Ігнорувати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>Дзвінок</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>Дзвінок</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>Копіювати номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>Додати до контактів</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>Поділитися за допомогою email</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>Зв&apos;яжись зі мною за допомогою Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>Моє RingId : </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>Показати QR-код</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>Копіювати</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>Відобразити дату</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>Відобразити автора</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation>Вхідне повідомлення від %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation>Номер Виклику</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>Зкопіювати Номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation>Зкопіювати %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation>Виклик %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>АККАУНТ RING НЕ ЗНАЙДЕНО</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation>Вхідний виклик від %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation>%1</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation>Розмова з %1</translation>
@@ -618,6 +684,11 @@
         <translation>Згортати вікно при закриванні</translation>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>Відео</translation>
@@ -648,62 +719,62 @@
         <translation>Завжди робити запис</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>Перевіряти оновлення автоматично кожні</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>днів</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>Перевірити оновлення</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation>Попередній перегляд не доступний від час виклику</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation>Вибір пристрою</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>Пристрій</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>Роздільна здатність</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>Пристрій Виведення</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>Пристрій Введення</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>додати новий контакт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>Імпортувати</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>Експортувати</translation>
     </message>
@@ -713,17 +784,17 @@
         <translation>Аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>Завантажувати Ring разом з системою</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>Новий аккаунт</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation>Ви все ще бажаєте очистити історію?</translation>
     </message>
@@ -739,14 +810,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation>&lt;Дії з багатьма контактами&gt;</translation>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -780,6 +843,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>Прийняти</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>Форма</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>Відміна</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>Ок</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -810,17 +952,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>Конфігурація</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>Вийти</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>Про программу</translation>
     </message>
@@ -899,31 +1041,42 @@
         <source>No default mail client found</source>
         <translation>Не знайдено жодного поштового клієнту</translation>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation>Діалог</translation>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation>Авто</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>Форма</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
-        <translation>Текстове поле</translation>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -969,22 +1122,22 @@
         <translation>Приєднати виклики</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation>Назва етикетки</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>Додати до контактів</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>Витрачено часу</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1002,17 +1155,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>Поділитися частиною екрану</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>Поділитися екраном</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>Відправити файл</translation>
     </message>
@@ -1020,23 +1173,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>Почекайте пока ваш аккаунт створюється.</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>Невідомий</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>Оберіть ваш логін:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>Оберіть ваше ім&apos;я користувача</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>Пароль</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>Підтвердити пароль</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Генерація вашого облікового запису Ring...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 29454d6..1e9d1c4 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -1,4 +1,4 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation>釋出：Louis-Joseph Papineau</translation>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
         <translation>版本</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,330 +47,400 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>通用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
         <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>型</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>別名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
         <translation>參數</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>主機名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>使用者名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation>刪除帳號</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>代理</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation>語音留言號</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation>來電自動應答</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation>UPnP 已啟動</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation>允許未知來電</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation>允許通訊錄來電</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation>允許歷史來電</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation>Ring 帳號設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
         <translation>音訊/視訊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
         <translation>音訊編碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
         <translation>視訊編碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
         <translation>註冊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
         <translation>網路介面</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation>與本地參數相同</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation>設定公開地址與連結埠：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation>地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>埠</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>使用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>最小值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>最大值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>安全</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation>媒體串流加密(SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>取消</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation>加密媒體串流(SRTP)</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation>公開發佈地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation>CA 認證</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation>使用者認證</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation>私鑰</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation>私鑰保護密碼</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation>使用預設加密方式</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
         <translation>暫停</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
+        <location filename="../accountdetails.cpp" line="231"/>
         <source>Files (*)</source>
         <translation>檔案(*)</translation>
     </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>從</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
         <translation>或是輸入號碼...</translation>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation>從</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation>從通訊錄尋找或是輸入ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>對話</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation>設定選單</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
         <translation>分享你的ring ID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation>傳送訊息</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation>想要與你談天！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation>接通</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation>撥打</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation>撥打</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation>加入通訊錄</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation>透過email分享</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation>透過Ring聯絡我</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
         <translation>我的Ring ID是：</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation>顯示QRCode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
         <translation>複製</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
         <translation>顯示日期</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
         <translation>顯示作者</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation> </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation>找不到Ring帳號</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>影像</translation>
@@ -647,62 +718,62 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation>自動檢查更新每</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation>天</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation>檢查更新</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
         <translation>裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
         <translation>解析度</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
         <translation>輸出裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
         <translation>輸入裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
         <translation>加入新的帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
         <translation>載入</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>輸出</translation>
     </message>
@@ -712,17 +783,17 @@
         <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
         <translation>啟動時執行</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>注册</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>從</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>從</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>確定</translation>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -809,17 +951,17 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation>從</translation>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation>加入通話</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation>加入通訊錄 </translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation>經過時間</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation>分享整個螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation>分享部分螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>分享檔案</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
-        <translation>請等待片刻，我們將為你創建新的帳戶</translation>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
         <translation>未知</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation>選擇你的使用者名稱:</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation>選擇你的使用者名稱</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>密码</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>Ring 帳號產生中...</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <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 ce80d51..8a9dcb1 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -1,572 +1,639 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_CN" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>关于</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
         <source>Credits</source>
+        <translation>致谢</translation>
+    </message>
+    <message>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <translation>Ring的Microsoft Windows客户端。
+Ring是安全的、分布式的通讯软件。</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation>版本</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
-        <translation type="unfinished"/>
+        <translation>开发者：</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
-        <translation type="unfinished"/>
+        <translation>界面设计：</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
-        <translation type="unfinished"/>
+        <translation>基于SFLPhone项目</translation>
     </message>
 </context>
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>设置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>通用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>帐户</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
-        <translation type="unfinished"/>
+        <translation>类别</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
-        <translation type="unfinished"/>
+        <translation>别名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation>参数</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
-        <translation type="unfinished"/>
+        <translation>主机名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation>用户名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
-        <translation type="unfinished"/>
+        <translation>代理</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
-        <translation type="unfinished"/>
+        <translation>语音信箱号码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
+        <translation>自动应答</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
-        <translation type="unfinished"/>
+        <translation>UPnP已启用</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
+        <translation>允许未知来电</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation>允许通讯录来电</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
+        <translation>允许历史记录再次来电</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation>名称服务器URL</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
+        <translation>Ring帐户设置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
+        <translation>铃声选择</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>播放</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation>音频/视频</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation>音频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation>视频编码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
-        <translation type="unfinished"/>
+        <translation>高级</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation>注册</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
+        <translation>注册超时（秒）：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation>网络接口</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
-        <translation type="unfinished"/>
+        <translation>本地端口：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
-        <translation type="unfinished"/>
+        <translation>与本地配置相同</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
-        <translation type="unfinished"/>
+        <translation>设置公开地址与端口：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
-        <translation type="unfinished"/>
+        <translation>地址：</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
-        <translation type="unfinished"/>
+        <translation>端口</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
-        <translation type="unfinished"/>
+        <translation>使用STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
-        <translation type="unfinished"/>
+        <translation>服务器URL</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
-        <translation type="unfinished"/>
+        <translation>使用TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation>域</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation>SDP协议握手（当ICE协议不受支持）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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>该设置仅用于SDP握手，仅当服务器或客户端不支持ICE时生效。</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>音频RTP端口范围</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
-        <translation type="unfinished"/>
+        <translation>最小</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
-        <translation type="unfinished"/>
+        <translation>最大</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation>视频RTP端口范围</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
-        <translation type="unfinished"/>
+        <translation>安全</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
+        <translation>流媒体加密（SRTP）</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>设备</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation>添加设备</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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"/>
+        <source>Password (required)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2295"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2321"/>
+        <source>Export on the Ring</source>
+        <translation>Ring导出</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2373"/>
+        <source>Your generated pin:</source>
+        <translation>您的PIN：</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2386"/>
+        <source>PIN</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation>确定</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
-        <translation type="unfinished"/>
+        <translation>加密流媒体（SRTP）</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
-        <translation type="unfinished"/>
+        <translation>公开地址</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <translation>颁发机构证书</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
-        <translation type="unfinished"/>
+        <translation>用户证书</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation>私钥</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
-        <translation type="unfinished"/>
+        <translation>私钥密码</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
-        <translation type="unfinished"/>
+        <translation>使用默认加密算法</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
-        <translation type="unfinished"/>
+        <translation>暂停</translation>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
+        <translation>RingID</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
+        <translation>选择文件</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation>文件 (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
-        <source>Files (*)</source>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation>密码错误。</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation>表单</translation>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
-        <translation type="unfinished"/>
+        <translation>或输入号码…</translation>
     </message>
     <message>
         <location filename="../callutilsdialog.ui" line="104"/>
         <source>Transfer</source>
-        <translation type="unfinished"/>
+        <translation>传输</translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
+        <translation>查找通讯录或输入RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation>会话</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation>联系人请求</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
-        <translation type="unfinished"/>
+        <translation>设置菜单</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;这是您的RingID。&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;复制并发送给您的朋友！&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation type="unfinished"/>
+        <translation>共享您的RingID</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;双击复制&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
+        <translation>创建二维码时产生错误</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
-        <translation type="unfinished"/>
+        <translation>会话，与</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
-        <translation type="unfinished"/>
+        <translation>开始会话！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
+        <translation>发送消息</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
+        <translation>想要与您通信！</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
-        <translation type="unfinished"/>
+        <translation>应答</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
-        <translation type="unfinished"/>
+        <translation>正在通话</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
-        <translation>打电话</translation>
+        <translation>通话</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation>复制号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
-        <translation type="unfinished"/>
+        <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <translation>在Ring上联系我</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="926"/>
+        <source>My RingId is : </source>
+        <translation>我的RingID是：</translation>
     </message>
     <message>
         <location filename="../callwidget.cpp" line="212"/>
-        <source>My RingId is : </source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>复制</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>显示日期</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>显示作者</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>消息来自%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation>复制名称</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
-        <translation type="unfinished"/>
+        <translation>通话号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
-        <translation type="unfinished"/>
+        <translation>复制号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
-        <translation type="unfinished"/>
+        <translation>复制%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
-        <translation type="unfinished"/>
+        <translation>呼叫%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
-        <translation type="unfinished"/>
+        <translation>未找到Ring帐户</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation>来电：%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
-        <translation type="unfinished"/>
+        <translation>与%1的会话</translation>
     </message>
 </context>
 <context>
@@ -574,175 +641,172 @@
     <message>
         <location filename="../configurationwidget.ui" line="20"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation>设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="100"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation>通用</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="171"/>
         <source>quit settings menu</source>
-        <translation type="unfinished"/>
+        <translation>退出设置菜单</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="331"/>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation>历史记录设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="372"/>
         <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
+        <translation>历史记录保存天数</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="415"/>
         <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
+        <translation>（设置为0则无限制）</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="469"/>
         <source>Clear History</source>
-        <translation type="unfinished"/>
+        <translation>清除历史记录</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="615"/>
         <source>Misc. Settings</source>
-        <translation type="unfinished"/>
+        <translation>其他设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="637"/>
         <source>Keep minimized on close</source>
+        <translation>退出时保持窗口最小化</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
-        <translation type="unfinished"/>
+        <translation>视频</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="249"/>
         <source>Profile</source>
-        <translation type="unfinished"/>
+        <translation>帐户资料</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="299"/>
         <source>Name</source>
-        <translation type="unfinished"/>
+        <translation>姓名</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="506"/>
         <source>Record Settings</source>
-        <translation type="unfinished"/>
+        <translation>录音设置</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="539"/>
         <source>Save in :</source>
-        <translation type="unfinished"/>
+        <translation>保存至：</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="582"/>
         <source>Always Record</source>
+        <translation>总是录制</translation>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="709"/>
-        <source>days</source>
-        <translation type="unfinished"/>
+        <translation>自动检查更新：每</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
+        <source>days</source>
+        <translation>天</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
+        <translation>通话时无法预览</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
-        <translation type="unfinished"/>
+        <translation>设备选择</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation>设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
-        <translation type="unfinished"/>
+        <translation>分辨率</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation type="unfinished"/>
+        <translation>输出设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation type="unfinished"/>
+        <translation>输入设备</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
-        <translation type="unfinished"/>
+        <translation>添加新帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>倒入</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
-        <translation type="unfinished"/>
+        <translation>导出</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="132"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
+        <translation>系统启动时运行Ring</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
-        <translation type="unfinished"/>
+        <translation>新帐户</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
+        <translation>确定删除您的所有历史记录吗？</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
         <source>Choose Directory</source>
-        <translation type="unfinished"/>
+        <translation>选择文件夹</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="409"/>
         <source>An error occured while importing account.</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
+        <translation>导入帐户时发生错误。</translation>
     </message>
 </context>
 <context>
@@ -750,55 +814,134 @@
     <message>
         <location filename="../contactpicker.ui" line="33"/>
         <source>Existing Contact</source>
-        <translation type="unfinished"/>
+        <translation>已有联系人</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="43"/>
         <source>Search...</source>
-        <translation type="unfinished"/>
+        <translation>搜索…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="56"/>
         <source>Create new contact</source>
-        <translation type="unfinished"/>
+        <translation>创建新通讯录</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="75"/>
         <source>New Contact</source>
-        <translation type="unfinished"/>
+        <translation>新通讯录</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="98"/>
         <source>Enter a name here...</source>
-        <translation type="unfinished"/>
+        <translation>在此处输入名称…</translation>
     </message>
     <message>
         <location filename="../contactpicker.ui" line="128"/>
         <source>Create</source>
+        <translation>创建</translation>
+    </message>
+</context>
+<context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation>表单</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation>接听</translation>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation>屏蔽</translation>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation>表单</translation>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation>确定</translation>
+    </message>
 </context>
 <context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
         <source>Send text message...</source>
-        <translation type="unfinished"/>
+        <translation>发送文字消息…</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>复制</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="52"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>显示日期</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="56"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>显示作者</translation>
     </message>
 </context>
 <context>
@@ -806,22 +949,22 @@
     <message>
         <location filename="../mainwindow.ui" line="435"/>
         <source>Ring</source>
-        <translation>响铃</translation>
+        <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation>参数设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation>退出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>关于</translation>
     </message>
 </context>
 <context>
@@ -829,38 +972,38 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="26"/>
         <source>Path</source>
-        <translation type="unfinished"/>
+        <translation>路径</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="46"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation>密码</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="65"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>确定</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
         <source>Save File</source>
-        <translation type="unfinished"/>
+        <translation>保存文件</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>Ring档案文件 (*.ring)</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="65"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation>打开文件</translation>
     </message>
 </context>
 <context>
@@ -868,27 +1011,27 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation type="unfinished"/>
+        <translation>Photobooth</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="58"/>
         <source>or</source>
-        <translation type="unfinished"/>
+        <translation>或</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.ui" line="71"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>倒入</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>选择文件</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="61"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>文件 (*)</translation>
     </message>
 </context>
 <context>
@@ -896,32 +1039,43 @@
     <message>
         <location filename="../utils.cpp" line="185"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation>未找到默认邮件客户端</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring帐户</translation>
     </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
-        <translation type="unfinished"/>
+        <translation>自动</translation>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
+        <translation>表单</translation>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -930,114 +1084,241 @@
     <message>
         <location filename="../videooverlay.ui" line="42"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation>通话等待中</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="119"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation>等待/取消等待</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="154"/>
         <source>Chat</source>
-        <translation type="unfinished"/>
+        <translation>聊天</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="186"/>
         <source>Add person to call</source>
-        <translation type="unfinished"/>
+        <translation>将其他人加入通话</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="218"/>
         <source>Transfer call</source>
-        <translation type="unfinished"/>
+        <translation>转接通话</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="256"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation>将麦克风静音</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="367"/>
         <source>Quality</source>
-        <translation type="unfinished"/>
+        <translation>质量</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="399"/>
         <source>Join Calls</source>
-        <translation type="unfinished"/>
+        <translation>加入通话</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation>名称标签</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
-        <translation type="unfinished"/>
+        <translation>加入通讯录</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
-        <translation type="unfinished"/>
+        <translation>用时</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
-        <translation type="unfinished"/>
+        <translation>00:00</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="87"/>
         <source>Hangup</source>
-        <translation type="unfinished"/>
+        <translation>挂断</translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="297"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation>关闭视频</translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
-        <source>Share entire screen</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../videoview.cpp" line="235"/>
-        <source>Share screen area</source>
-        <translation type="unfinished"/>
+        <source>Share entire screen</source>
+        <translation>共享整个屏幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="238"/>
+        <source>Share screen area</source>
+        <translation>共享屏幕区域</translation>
+    </message>
+    <message>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
-        <translation type="unfinished"/>
+        <translation>共享文件</translation>
     </message>
 </context>
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>将此设备与一个帐户进行连接</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation>创建您的帐户资料</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation>创建Ring帐户</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
+        <translation>设置您的用户名：</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
-        <source>Next</source>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation>注册公共用户名（试验性）</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>密码</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>确认密码</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation>正在生成您的Ring帐户…</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation>上一步</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
+        <source>Next</source>
+        <translation>下一步</translation>
+    </message>
 </context>
 </TS>
\ No newline at end of file

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 c5b5636..f7335e2 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -1,11 +1,11 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.1">
+<?xml version="1.0" ?><!DOCTYPE TS><TS language="zh_TW" version="2.0">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>關於</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="475"/>
@@ -13,38 +13,33 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="554"/>
-        <source>Release : Louis-Joseph Papineau</source>
+        <location filename="../aboutdialog.ui" line="541"/>
+        <source>Release : Beta 2 - Gaston Miron</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.ui" line="570"/>
+        <location filename="../aboutdialog.ui" line="557"/>
         <source>The Microsoft Windows client for Ring.
 Ring is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="32"/>
-        <source>Windows Ring</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../aboutdialog.cpp" line="33"/>
+        <location filename="../aboutdialog.cpp" line="30"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation>版本</translation>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="40"/>
+        <location filename="../aboutdialog.cpp" line="37"/>
         <source>Created by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="52"/>
+        <location filename="../aboutdialog.cpp" line="67"/>
         <source>Artwork by:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../aboutdialog.cpp" line="56"/>
+        <location filename="../aboutdialog.cpp" line="71"/>
         <source>Based on the SFLPhone project</source>
         <translation type="unfinished"/>
     </message>
@@ -52,333 +47,403 @@
 <context>
     <name>AccountDetails</name>
     <message>
-        <location filename="../accountdetails.ui" line="20"/>
+        <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="60"/>
+        <location filename="../accountdetails.ui" line="63"/>
         <source>General</source>
         <translation>一般</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="175"/>
+        <location filename="../accountdetails.ui" line="137"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="238"/>
+        <location filename="../accountdetails.ui" line="197"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="204"/>
+        <location filename="../accountdetails.ui" line="163"/>
         <source>Alias</source>
         <translation>別名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="308"/>
+        <location filename="../accountdetails.ui" line="241"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation>參數</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="341"/>
+        <location filename="../accountdetails.ui" line="271"/>
         <source>Hostname</source>
         <translation>主機名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="608"/>
-        <location filename="../accountdetails.ui" line="1551"/>
+        <location filename="../accountdetails.ui" line="405"/>
+        <location filename="../accountdetails.ui" line="1482"/>
+        <location filename="../accountdetails.cpp" line="115"/>
         <source>Username</source>
         <translation>使用者名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="381"/>
-        <location filename="../accountdetails.ui" line="1570"/>
+        <location filename="../accountdetails.ui" line="445"/>
+        <location filename="../accountdetails.ui" line="1501"/>
         <source>Password</source>
         <translation>密碼</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="127"/>
-        <source>delete account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="424"/>
+        <location filename="../accountdetails.ui" line="488"/>
         <source>Proxy</source>
         <translation>Proxy</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="464"/>
+        <location filename="../accountdetails.ui" line="528"/>
         <source>Voicemail number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="498"/>
+        <location filename="../accountdetails.ui" line="562"/>
         <source>Auto-answer calls</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="516"/>
+        <location filename="../accountdetails.ui" line="580"/>
         <source>UPnP enabled</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="531"/>
-        <source>DTMF tone type</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="548"/>
-        <source>RTP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="566"/>
-        <source>SIP</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="699"/>
+        <location filename="../accountdetails.ui" line="638"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="726"/>
+        <location filename="../accountdetails.ui" line="665"/>
         <source>Allow Call From Contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="714"/>
+        <location filename="../accountdetails.ui" line="653"/>
         <source>Allow Call From History</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="674"/>
+        <location filename="../accountdetails.ui" line="311"/>
+        <source>Public username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="354"/>
+        <location filename="../accountdetails.cpp" line="106"/>
+        <location filename="../accountdetails.cpp" line="359"/>
+        <location filename="../accountdetails.cpp" line="376"/>
+        <location filename="../accountdetails.cpp" line="381"/>
+        <location filename="../accountdetails.cpp" line="386"/>
+        <location filename="../accountdetails.cpp" line="391"/>
+        <source>Register on blockchain</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="371"/>
+        <source>Name service URL</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="611"/>
         <source>Ring Account Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="772"/>
+        <location filename="../accountdetails.ui" line="701"/>
         <source>Ringtone Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="796"/>
-        <location filename="../accountdetails.cpp" line="56"/>
+        <location filename="../accountdetails.ui" line="725"/>
+        <location filename="../accountdetails.cpp" line="57"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>播放</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="854"/>
+        <location filename="../accountdetails.ui" line="785"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation>音訊/視訊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1070"/>
+        <location filename="../accountdetails.ui" line="1001"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation>音訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1100"/>
+        <location filename="../accountdetails.ui" line="1031"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation>視訊編解碼器</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1117"/>
+        <location filename="../accountdetails.ui" line="1048"/>
         <source>Advanced</source>
         <translation>進階</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1163"/>
+        <location filename="../accountdetails.ui" line="1094"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation>註冊</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1183"/>
+        <location filename="../accountdetails.ui" line="1114"/>
         <source>Registration expire timeout (seconds):</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1221"/>
+        <location filename="../accountdetails.ui" line="1152"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation>網路介面</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1242"/>
+        <location filename="../accountdetails.ui" line="1173"/>
         <source>Local Port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1346"/>
+        <location filename="../accountdetails.ui" line="1277"/>
         <source>Same as local parameters</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1367"/>
+        <location filename="../accountdetails.ui" line="1298"/>
         <source>Set published address and port:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1393"/>
+        <location filename="../accountdetails.ui" line="1324"/>
         <source>Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1424"/>
+        <location filename="../accountdetails.ui" line="1355"/>
         <source>Port</source>
         <translation>連接埠</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1478"/>
+        <location filename="../accountdetails.ui" line="1409"/>
         <source>Use STUN</source>
         <translation>使用 STUN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1494"/>
-        <location filename="../accountdetails.ui" line="1535"/>
+        <location filename="../accountdetails.ui" line="1425"/>
+        <location filename="../accountdetails.ui" line="1466"/>
         <source>Server URL</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1519"/>
+        <location filename="../accountdetails.ui" line="1450"/>
         <source>Use TURN</source>
         <translation>使用 TURN</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1586"/>
+        <location filename="../accountdetails.ui" line="1517"/>
         <source>Realm</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1635"/>
+        <location filename="../accountdetails.ui" line="1566"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1663"/>
+        <location filename="../accountdetails.ui" line="1594"/>
         <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="1705"/>
+        <location filename="../accountdetails.ui" line="1636"/>
         <source>Audio RTP Port Range</source>
         <translation>音訊 RTP 連接埠範圍</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1735"/>
-        <location filename="../accountdetails.ui" line="1869"/>
+        <location filename="../accountdetails.ui" line="1666"/>
+        <location filename="../accountdetails.ui" line="1800"/>
         <source>Min</source>
         <translation>最小值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1766"/>
-        <location filename="../accountdetails.ui" line="1900"/>
+        <location filename="../accountdetails.ui" line="1697"/>
+        <location filename="../accountdetails.ui" line="1831"/>
         <source>Max</source>
         <translation>最大值</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1839"/>
+        <location filename="../accountdetails.ui" line="1770"/>
         <source>Video RTP Port Range</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="1965"/>
+        <location filename="../accountdetails.ui" line="1896"/>
         <source>Security</source>
         <translation>安全性</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2337"/>
+        <location filename="../accountdetails.ui" line="2115"/>
         <source>Media Stream Encryption (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2355"/>
+        <location filename="../accountdetails.ui" line="2180"/>
+        <source>Devices</source>
+        <translation>裝置</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2224"/>
+        <source>Add device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2251"/>
+        <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>取消</translation>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2396"/>
+        <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"/>
+        <source>OK</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2440"/>
+        <source>Banned Contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2112"/>
         <source>Encrypt media stream (SRTP)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2022"/>
-        <source>Negotiation Encryption</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="1316"/>
+        <location filename="../accountdetails.ui" line="1247"/>
         <source>Published Address</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2040"/>
-        <source>Encrypt negotiation (TLS)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2124"/>
+        <location filename="../accountdetails.ui" line="1961"/>
         <source>CA certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2161"/>
+        <location filename="../accountdetails.ui" line="1998"/>
         <source>User certificate</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2195"/>
+        <location filename="../accountdetails.ui" line="2032"/>
         <source>Private key</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2210"/>
+        <location filename="../accountdetails.ui" line="2047"/>
         <source>Private key password</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2073"/>
-        <source>Verify incoming certificates (server side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2103"/>
-        <source>Verify answer certificates (client side)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2088"/>
-        <source>Require a certificate for incoming TLS connections</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2269"/>
+        <location filename="../accountdetails.ui" line="2127"/>
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="54"/>
+        <location filename="../accountdetails.cpp" line="55"/>
         <source>Pause</source>
+        <translation>暫停</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="101"/>
+        <source>RingID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="242"/>
+        <location filename="../accountdetails.cpp" line="229"/>
         <source>Choose File</source>
+        <translation>選擇檔案</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="231"/>
+        <source>Files (*)</source>
+        <translation>檔案 (*)</translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="304"/>
+        <source>Please wait while your PIN is generated.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.cpp" line="244"/>
-        <source>Files (*)</source>
+        <location filename="../accountdetails.cpp" line="323"/>
+        <source>Network Error. Please try again later.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="327"/>
+        <source>Wrong password.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../accountdetails.cpp" line="354"/>
+        <source>Registering... It may take some time</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>BannedContactsWidget</name>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="20"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="66"/>
+        <source>Banned ID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../bannedcontactswidget.ui" line="98"/>
+        <source>Deban contact, and add to contact list</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
     <name>CallUtilsDialog</name>
     <message>
-        <location filename="../callutilsdialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../callutilsdialog.ui" line="65"/>
         <source>or type number...</source>
-        <translation type="unfinished"/>
+        <translation>或輸入號碼...</translation>
     </message>
     <message>
         <location filename="../callutilsdialog.ui" line="104"/>
@@ -389,181 +454,182 @@
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="20"/>
-        <source>Form</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="197"/>
+        <location filename="../callwidget.ui" line="213"/>
         <source>Search contacts or enter ring ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="556"/>
+        <location filename="../callwidget.ui" line="324"/>
+        <source>Conversations</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="375"/>
+        <source>Contact requests</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="545"/>
         <source>settings menu</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="638"/>
-        <source>Ring is a secure and distributed voice, video, and chat communication platform that requires no centralized server and leaves the power of privacy in the hands of the user.</source>
+        <location filename="../callwidget.ui" line="627"/>
+        <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="670"/>
+        <location filename="../callwidget.ui" line="659"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;This is your RingID.&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;Copy and share it with your friends!&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
+        <translation>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;這是你的 RingID。&lt;/span&gt;&lt;/p&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; font-size:10pt; color:#aeaeae;&quot;&gt;複製並與你的朋友分享！&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="774"/>
+        <location filename="../callwidget.ui" line="763"/>
         <source>Share your ring id</source>
-        <translation type="unfinished"/>
+        <translation>分享你的 ring id</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="829"/>
+        <location filename="../callwidget.ui" line="866"/>
         <source>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p align=&quot;center&quot;&gt;&lt;span style=&quot; color:#aeaeae;&quot;&gt;Double-click to copy.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="842"/>
+        <location filename="../callwidget.ui" line="895"/>
         <source>Error while generating QR Code</source>
+        <translation>產生 QR Code 時發生錯誤</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1067"/>
+        <source>contact request</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="944"/>
+        <location filename="../callwidget.ui" line="1094"/>
         <source>Conversation with</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1027"/>
+        <location filename="../callwidget.ui" line="1177"/>
         <source>Start the conversation !</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1114"/>
+        <location filename="../callwidget.ui" line="1264"/>
         <source>send message</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1240"/>
+        <location filename="../callwidget.ui" line="1390"/>
+        <source>BestId</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1400"/>
         <source>Wants to talk to you!</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1335"/>
+        <location filename="../callwidget.ui" line="1495"/>
         <source>Answer</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1367"/>
+        <location filename="../callwidget.ui" line="1527"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1438"/>
+        <location filename="../callwidget.ui" line="1598"/>
         <source>Calling</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1492"/>
+        <location filename="../callwidget.ui" line="1671"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1230"/>
+        <location filename="../callwidget.ui" line="1380"/>
         <source>Call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="150"/>
-        <location filename="../callwidget.cpp" line="294"/>
+        <location filename="../callwidget.cpp" line="279"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="156"/>
-        <location filename="../callwidget.cpp" line="300"/>
+        <location filename="../callwidget.cpp" line="290"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="210"/>
-        <source>Share by email</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>Contact me on Ring</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="212"/>
+        <location filename="../callwidget.cpp" line="926"/>
         <source>My RingId is : </source>
-        <translation type="unfinished"/>
+        <translation>我的 RingId 是：</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
-        <source>Show QRCode</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="229"/>
+        <location filename="../callwidget.cpp" line="212"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>複製</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="239"/>
+        <location filename="../callwidget.cpp" line="222"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>顯示日期</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="243"/>
+        <location filename="../callwidget.cpp" line="226"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>顯示作者</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="271"/>
+        <location filename="../callwidget.cpp" line="255"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="310"/>
+        <location filename="../callwidget.cpp" line="284"/>
+        <source>Copy name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="300"/>
         <source>Call Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="311"/>
+        <location filename="../callwidget.cpp" line="301"/>
         <source>Copy Number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="314"/>
+        <location filename="../callwidget.cpp" line="304"/>
         <source>Copy %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="319"/>
+        <location filename="../callwidget.cpp" line="309"/>
         <source>Call %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="349"/>
-        <location filename="../callwidget.cpp" line="406"/>
+        <location filename="../callwidget.cpp" line="749"/>
         <source>NO RING ACCOUNT FOUND</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="431"/>
+        <location filename="../callwidget.cpp" line="414"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="417"/>
-        <source>%1</source>
-        <comment>%1 is the name of the caller</comment>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="694"/>
+        <location filename="../callwidget.cpp" line="784"/>
         <source>Conversation with %1</source>
         <comment>%1 is the contact name</comment>
         <translation type="unfinished"/>
@@ -589,7 +655,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="331"/>
         <source>History Settings</source>
-        <translation type="unfinished"/>
+        <translation>記錄設定</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="372"/>
@@ -604,7 +670,7 @@
     <message>
         <location filename="../configurationwidget.ui" line="469"/>
         <source>Clear History</source>
-        <translation type="unfinished"/>
+        <translation>清除記錄</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="615"/>
@@ -617,6 +683,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../configurationwidget.ui" line="775"/>
+        <source>Check for updates now</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../configurationwidget.ui" line="116"/>
         <source>Video</source>
         <translation>視訊</translation>
@@ -647,89 +718,89 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="681"/>
+        <location filename="../configurationwidget.ui" line="652"/>
+        <source>Enable notifications</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../configurationwidget.ui" line="699"/>
         <source>Check for update automatically every</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="709"/>
+        <location filename="../configurationwidget.ui" line="736"/>
         <source>days</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="736"/>
-        <source>Check for updates</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="849"/>
+        <location filename="../configurationwidget.ui" line="888"/>
         <source>Preview unavailable during call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="903"/>
+        <location filename="../configurationwidget.ui" line="942"/>
         <source>Device Selection</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="961"/>
+        <location filename="../configurationwidget.ui" line="1000"/>
         <source>Device</source>
-        <translation type="unfinished"/>
+        <translation>裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="992"/>
+        <location filename="../configurationwidget.ui" line="1031"/>
         <source>Resolution</source>
-        <translation type="unfinished"/>
+        <translation>解析度</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1029"/>
+        <location filename="../configurationwidget.ui" line="1068"/>
         <source>Output Device</source>
-        <translation type="unfinished"/>
+        <translation>輸出裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1044"/>
+        <location filename="../configurationwidget.ui" line="1083"/>
         <source>Input Device</source>
-        <translation type="unfinished"/>
+        <translation>輸入裝置</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
+        <location filename="../configurationwidget.ui" line="1180"/>
         <source>add new account</source>
-        <translation type="unfinished"/>
+        <translation>加入新帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1168"/>
+        <location filename="../configurationwidget.ui" line="1242"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>匯入</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="1175"/>
+        <location filename="../configurationwidget.ui" line="1249"/>
         <source>Export</source>
         <translation>匯出</translation>
     </message>
     <message>
         <location filename="../configurationwidget.ui" line="132"/>
         <source>Account</source>
-        <translation type="unfinished"/>
+        <translation>帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="661"/>
+        <location filename="../configurationwidget.ui" line="676"/>
         <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
+        <translation>開機時啟動 Ring</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="303"/>
+        <location filename="../configurationwidget.cpp" line="310"/>
         <source>New Account</source>
         <translation>新增帳號</translation>
     </message>
     <message>
-        <location filename="../configurationwidget.cpp" line="324"/>
+        <location filename="../configurationwidget.cpp" line="330"/>
         <source>Are you sure you want to clear all your history?</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="379"/>
         <source>Choose Directory</source>
-        <translation type="unfinished"/>
+        <translation>選擇資料夾</translation>
     </message>
     <message>
         <location filename="../configurationwidget.cpp" line="409"/>
@@ -738,14 +809,6 @@
     </message>
 </context>
 <context>
-    <name>ContactDelegate</name>
-    <message>
-        <location filename="../contactdelegate.cpp" line="87"/>
-        <source>&lt;Multiple contact methods&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>ContactPicker</name>
     <message>
         <location filename="../contactpicker.ui" line="33"/>
@@ -779,6 +842,85 @@
     </message>
 </context>
 <context>
+    <name>ContactRequestWidget</name>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="14"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="28"/>
+        <source>Incoming Contact Request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="87"/>
+        <source>nameLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="103"/>
+        <source>bestIdLabel</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="129"/>
+        <source>Accept</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="152"/>
+        <source>Discard</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../contactrequestwidget.ui" line="175"/>
+        <source>Block</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>CurrentAccountWidget</name>
+    <message>
+        <location filename="../currentaccountwidget.ui" line="26"/>
+        <source>Form</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
+    <name>DeleteAccountDialog</name>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="14"/>
+        <source>Ring - account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="33"/>
+        <source>Do you realy want to delete account ?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="66"/>
+        <source>This action is irrevocable</source>
+        <translation type="unfinished"/>
+    </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"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="138"/>
+        <source>Cancel</source>
+        <translation>取消</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="164"/>
+        <source>Ok</source>
+        <translation type="unfinished"/>
+    </message>
+</context>
+<context>
     <name>InstantMessagingWidget</name>
     <message>
         <location filename="../instantmessagingwidget.ui" line="71"/>
@@ -788,17 +930,17 @@
     <message>
         <location filename="../instantmessagingwidget.cpp" line="46"/>
         <source>Copy</source>
-        <translation type="unfinished"/>
+        <translation>複製</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="52"/>
         <source>Display date</source>
-        <translation type="unfinished"/>
+        <translation>顯示日期</translation>
     </message>
     <message>
         <location filename="../instantmessagingwidget.cpp" line="56"/>
         <source>Display author</source>
-        <translation type="unfinished"/>
+        <translation>顯示作者</translation>
     </message>
 </context>
 <context>
@@ -809,19 +951,19 @@
         <translation>Ring</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="57"/>
+        <location filename="../mainwindow.cpp" line="53"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="60"/>
+        <location filename="../mainwindow.cpp" line="56"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="84"/>
+        <location filename="../mainwindow.cpp" line="80"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation>關於</translation>
     </message>
 </context>
 <context>
@@ -844,7 +986,7 @@
     <message>
         <location filename="../pathpassworddialog.ui" line="72"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation>取消</translation>
     </message>
     <message>
         <location filename="../pathpassworddialog.cpp" line="60"/>
@@ -878,17 +1020,17 @@
     <message>
         <location filename="../photoboothdialog.ui" line="71"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation>匯入</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="59"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation>選擇檔案</translation>
     </message>
     <message>
         <location filename="../photoboothdialog.cpp" line="61"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation>檔案 (*)</translation>
     </message>
 </context>
 <context>
@@ -898,30 +1040,41 @@
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="35"/>
+        <source>Ring account</source>
+        <comment>Default alias for new Ring account</comment>
+        <translation>Ring 帳號</translation>
+    </message>
 </context>
 <context>
     <name>QualityDialog</name>
     <message>
-        <location filename="../qualitydialog.ui" line="14"/>
-        <source>Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../qualitydialog.ui" line="100"/>
         <source>Auto</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>RingButton</name>
+    <name>SendContactRequestWidget</name>
     <message>
-        <location filename="../ringbutton.ui" line="26"/>
+        <location filename="../sendcontactrequestwidget.ui" line="14"/>
         <source>Form</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../ringbutton.ui" line="69"/>
-        <source>TextLabel</source>
+        <location filename="../sendcontactrequestwidget.ui" line="26"/>
+        <source>ContactID</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="39"/>
+        <source>TODO: Explain the purpose of a contact request</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../sendcontactrequestwidget.ui" line="78"/>
+        <source>Send contact request</source>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -968,22 +1121,22 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="473"/>
+        <location filename="../videooverlay.ui" line="490"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="495"/>
+        <location filename="../videooverlay.ui" line="512"/>
         <source>Add to contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="565"/>
+        <location filename="../videooverlay.ui" line="582"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="568"/>
+        <location filename="../videooverlay.ui" line="585"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
@@ -1001,17 +1154,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="232"/>
+        <location filename="../videoview.cpp" line="235"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="235"/>
+        <location filename="../videoview.cpp" line="238"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="242"/>
+        <location filename="../videoview.cpp" line="245"/>
         <source>Share file</source>
         <translation>分享檔案</translation>
     </message>
@@ -1019,23 +1172,150 @@
 <context>
     <name>WizardDialog</name>
     <message>
-        <location filename="../wizarddialog.cpp" line="58"/>
-        <source>Please wait while we create your account.</source>
+        <location filename="../wizarddialog.cpp" line="69"/>
+        <source>Your account needs to be migrated. Choose a password.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.cpp" line="74"/>
+        <location filename="../wizarddialog.cpp" line="105"/>
+        <source>Migrating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="125"/>
         <source>Unknown</source>
+        <translation>未知</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="159"/>
+        <source>Registering your public username, it may take a few minutes...</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="124"/>
+        <location filename="../wizarddialog.cpp" line="220"/>
+        <source>Add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="323"/>
+        <source>Username not available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="326"/>
+        <source>Username is available.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="329"/>
+        <source>Username is invalid.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="332"/>
+        <source>Network error.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="85"/>
+        <source>Create Ring account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="98"/>
+        <source>Link this device to an account</source>
+        <translation>連結這個裝置到一個帳號</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="127"/>
+        <source>How to add a device</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="134"/>
+        <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:'Ubuntu'; 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-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; 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-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-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-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-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-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-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="159"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="244"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="297"/>
+        <location filename="../wizarddialog.cpp" line="223"/>
+        <source>Create your account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="322"/>
         <source>Choose your username:</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="195"/>
-        <location filename="../wizarddialog.ui" line="198"/>
+        <location filename="../wizarddialog.ui" line="370"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="386"/>
+        <location filename="../wizarddialog.cpp" line="295"/>
+        <source>Searching...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="395"/>
+        <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="398"/>
+        <source>Register public username (experimental)</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="425"/>
+        <source>Enter your pin</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="455"/>
+        <source>Password</source>
+        <translation>密碼</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="485"/>
+        <source>Confirm password</source>
+        <translation>確認密碼</translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="553"/>
+        <location filename="../wizarddialog.cpp" line="107"/>
+        <source>Generating your Ring account...</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="589"/>
+        <source>Previous</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="621"/>
+        <location filename="../wizarddialog.ui" line="624"/>
         <source>Next</source>
         <translation type="unfinished"/>
     </message>