commit 5a1485bcb72a41364fcdadc168a8c94a9ea26b01
author Jenkins <jenkins@ring-packaging.cx> Mon Dec 17 07:41:01 2018 -0500
committer Jenkins <jenkins@ring-packaging.cx> Mon Dec 17 07:41:01 2018 -0500
tree 6bd34ef31bf1bad5399071403ffff5c00865477b
parent e17bb3f3d1cca55bfd8f400d6c23734580558ef0

i18n: automatic bump

Change-Id: I8131c24862d3fc7d6d1df2d296a9246476d81034

translations/ring_client_windows.ts

diff --git a/translations/ring_client_windows.ts b/translations/ring_client_windows.ts
index 6d42267..abdd5b5 100644
--- a/translations/ring_client_windows.ts
+++ b/translations/ring_client_windows.ts
@@ -31,8 +31,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -89,9 +89,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,6 +126,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
@@ -162,23 +171,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,11 +286,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"></translation>
@@ -319,7 +312,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -589,8 +581,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -615,13 +607,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -694,46 +686,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -772,639 +724,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1427,25 +966,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1501,12 +1040,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1514,33 +1053,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1553,32 +1089,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1593,52 +1106,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1648,7 +1141,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,17 +1149,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1680,7 +1173,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1720,12 +1213,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1744,20 +1232,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"></translation>
@@ -1785,11 +1259,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"></translation>
@@ -1811,12 +1280,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1855,6 +1329,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -1900,6 +1388,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
@@ -1968,7 +1461,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2030,21 +1523,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
@@ -2090,20 +1568,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -2165,8 +1629,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2249,7 +1742,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2289,7 +1782,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2329,7 +1822,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/ring_client_windows_ar.ts

diff --git a/translations/ring_client_windows_ar.ts b/translations/ring_client_windows_ar.ts
index a1f0ff3..e423d18 100644
--- a/translations/ring_client_windows_ar.ts
+++ b/translations/ring_client_windows_ar.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>وسيط Microsoft Windows إلى Ring
-Ring برمجية تواصل مؤمنة و موزعة.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>اسم المضيف</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>اسم المستخدم</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>تفعيل UPnP</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>إسمح لأشخاص  مجهولة بالإتصال</translation>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>إعدادات الحساب Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>تشغيل</translation>
     </message>
@@ -588,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>إستعمل قائمة الشيفرة المبدئية</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>إيقاف مؤقت</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>إختار ملف</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>وثائق (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>أو أكتب رقما</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>نقل</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>محادثات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>خطأ عند محاولة تولد الرمز الشريطي</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>أضف إلى الاتصالات المعروفة</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>يريد التحدث إليك!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>أجب</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>خطأ عند محاولة تولد الرمز الشريطي</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>أضف إلى الاتصالات المعروفة</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>يريد التحدث إليك!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>أجب</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>تجاهل</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>نسخ الرقم</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>عام</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>صوت/فيديو</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>حسابات</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>إعدادات التاريخ</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>أبقي على التاريخ ل (أيام)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(ضع صفر لتاريخ غير محدود)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>أزل التاريخ</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>إعدادات متنوعة</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>أبقي مصغر عند الغلق</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>خذ لمحة</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>الاسم</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>تسجيل الإعدادات</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>حفظ في:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>البحث عن تحديثات تلقائيًا كل</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>أيام</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>المعاينة غير متوفرة أثناء المكالمة</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>إختيارات الأجهزة</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>جهاز</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>دقة العرض (resolution)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>جهاز الإخراج</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>جهاز الإدخال</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>إضافة حساب جديد</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>تصدير</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>إطلق Ring عند بدء التشغيل</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>حساب جديد</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>هل أنت متأكد من حذف تاريخك  ؟</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>إتصال موجود</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>إبحث...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>أحدث إتصال جديد</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>إتصال جديد</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>أدخل اسم هنا</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>اقبل</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>إحذف</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>ألغِ</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>موافق</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>إعدادات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>ترتيب</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>غادر</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>عن RING</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>إختار ملف</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>وثائق (*)</translation>
     </message>
@@ -1513,37 +1051,34 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>آلي</translation>
-    </message>
-</context>
-<context>
     <name>RingButton</name>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>دردشة</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>كتم اللاقط</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>الجودة</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>ترتيب</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>أنهي المحادثة</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>أبكم الفيديو</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>تقاسم كل الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>تقاسم منطقة من الشاشة</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>تقاسم الوثيقة</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>إحداث حسابك Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>إحداث حسابك Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_bg.ts

diff --git a/translations/ring_client_windows_bg.ts b/translations/ring_client_windows_bg.ts
index dade94f..30ac9ca 100644
--- a/translations/ring_client_windows_bg.ts
+++ b/translations/ring_client_windows_bg.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Клиентът на Ring за Уиндоус.
-Ring е сигурен и разпределен софтуер за общуване.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Име на сървъра</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Потребителско име</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP е активиран</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Позволяване на обажданията от непознати</translation>
@@ -161,23 +169,12 @@
         <translation>Общодостъпно потребителско име</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Настройки на акаунта за Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Пускане</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Добавяне на устройство</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>За да добавите ново устройство в своя акаунт в Ring, трябва да изнесете акаунта си в Ring. Това ще Ви даде ПИН-код, който трябва да бъде въведен на новото устройство в рамките на 5 минути от създаването си.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,13 +605,13 @@
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Използване на шифри по подразбиране</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Пауза</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Изберете файл</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Всички файлове (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Грешна парола.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>или въведете номер…</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Прехвърляне</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Потърсете контакти или въведете ид. за Ring</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Разговори</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Грешка при създаването на QR-код</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Добавяне към контактите</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Желае да говори с Вас!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Отговор</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Грешка при създаването на QR-код</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Добавяне към контактите</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Желае да говори с Вас!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Отговор</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Игнориране</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Копиране на номера</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Свържете се с мен в Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Моят ид. за Ring е:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Входящо съобщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Входящо повикване от %1</translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Общи</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Звук/видео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Акаунти</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>изход от менюто за настройки</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Настройки на историята</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Пазене на историята (в дни)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(0 означава безкрайна история)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Изчистване на историята</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Разнообразни настройки</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Минимизиране при затваряне</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Профил</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Име</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Настройки за записването</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Запазване в:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Постоянно записване</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Проверка за обновления на всеки</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>дни</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Прегледът не е възможен по време на разговор</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Избор на устройство</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Устройство</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Разделителна способност</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Изходящо устройство</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Входящо устройство</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>добавяне на нов акаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Изнасяне</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Пускане на Ring със системата</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Нов акаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Наистина ли искате да изчистите цялата история?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Избиране на папка</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Съществуващ контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Търсене…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Създаване на нов контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Нов контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Въведете име…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Приемане</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Блокиране</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Изтриване</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Отказ</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Добре</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Настройка</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Изход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Относно</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Изберете файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Всички файлове (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Не е открит клиент за е-поща по подразбиране</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Авт.</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Задържан разговор</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Съобщения</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Добавяне на някого към обаждането</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Прехвърляне на обаждането</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Заглушаване на микрофона</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Качество</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Етикет за името</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Изминало време</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Настройка</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Затваряне</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Заглушаване на видеото</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Споделяне на целия екран</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Споделяне на област от екрана</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Споделяне на файл</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Създаване на профил</translation>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Създаване на Вашия акаунт в Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Създаване на Вашия акаунт в Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_ca.ts

diff --git a/translations/ring_client_windows_ca.ts b/translations/ring_client_windows_ca.ts
index 4ed599a..1a6548c 100644
--- a/translations/ring_client_windows_ca.ts
+++ b/translations/ring_client_windows_ca.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>Nom d&apos;amfitrió</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nom d&apos;usuari</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP habitlitat</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Reproduir</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation>Afegir dispositiu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Utilitza xifrats per defecte</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Contrasenya incorrecta.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Converses</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>El Ring és un programari per a comunicacions universals que respecta la llibertat i privacitat dels seus usuaris</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Afegir als contactes</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Afegir als contactes</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copia el número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Opcions</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Comptes</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Preferències d&apos;historial</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Dispositiu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exporta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Compte Nou</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Crear</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accepta</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bloqueja</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Suprimeix</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Cancel·la</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Opcions</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Quant a</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation>Compte de Ring</translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation>Xat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Compartir pantalla</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Compartir arxiu</translation>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Crei el seu perfil</translation>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generant el vostre compte de Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generant el vostre compte de Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 2e9a75f..8f06e1e 100644
--- a/translations/ring_client_windows_cs_CZ.ts
+++ b/translations/ring_client_windows_cs_CZ.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Klient Microsoft Windows pro Ring.
-Ring je bezpečný a distribuovaný komunikační program.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Název serveru</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Uživatelské jméno</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP povoleno</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Povolit hovory od neznámých</translation>
@@ -161,23 +169,12 @@
         <translation>Veřejné uživatelské jméno</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Zaregistrovat uživatelské jméno na blockchainu</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Nastavení účtu Ringu</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Přehrát</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Přidat zařízení</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exportovat na Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Použít výchozí šifry</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pozastavit</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Vyberte soubor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Soubory (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Počkejte prosím, zatímco bude váš PIN vytvářen.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Chyba v síti. Zkuste to, prosím, později znovu.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Špatné heslo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registruje se... Může to chvíli trvat</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>nebo vložte číslo...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Přenos dat</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Hledejte kontakty nebo zadejte Ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Konverzace</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dvakrát klepněte pro kopírování</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Chyba při vytváření QR kódu</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Přidat do kontaktů</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Chce s vámi hovořit!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Přijmout</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dvakrát klepněte pro kopírování</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Chyba při vytváření QR kódu</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Přidat do kontaktů</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Chce s vámi hovořit!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Přijmout</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Přehlížet</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Zkopírovat číslo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Spojte se se mnou přes Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mé Ring ID je :</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Příchozí zpráva od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Příchozí hovor od %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Nastavení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Obecné</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Zvuk/Obraz</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Účty</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>ukončit nabídku nastavení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Nastavení historie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Uchovávat historii po (dny)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Nastavte na 0 pro neomezenou historii)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Vymazat historii</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Smíšená natavení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Neukončovat Ring po uzavření okna</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Zkontrolovat aktualizace nyní</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Jméno</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Nastavení nahrávání</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Uložit do :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Vždy nahrávat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Povolit oznámení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Kontrolovat aktualizace každých</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dní</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Náhled během hovoru nedostupný</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Výběr zařízení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Zařízení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Rozlišení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Výstupní zařízení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Vstupní zařízení</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>přidat nový účet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportovat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Spouštět Ring po spuštění systému</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nový účet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Opravdu chcete vymazat všechnu svou historii?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Vyberte adresář</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Existující kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Hledat...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Vytvořit nový kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nový kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Zde vložte jméno...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Vytvořit</translation>
-    </message>
-</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>Příchozí žádost o kontakt</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Přijmout</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Zahodit</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokovat</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - smazání účtu</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Tento krok nelze odvolat</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>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Odstranit</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Zrušit</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation>Nastavení</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Odejít</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>O aplikaci</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Vybrat soubor</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Soubory (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Nenalezen žádný výchozí e-mailový klient</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automaticky</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulář</translation>
-    </message>
-    <message>
-        <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 type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Poslat žádost o kontakt</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Hovor pozastaven</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Rozhovor</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Připojit osobu k hovoru</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Přesměrovat hovor</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Ztlumit mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Jakost</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Spojit hovory</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Jmenný štítek</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Uplynulý čas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Nastavení</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Zavěsit</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Vypnout obraz</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Sdílet celou obrazovku</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Sdílet část obrazovky</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Sdílet soubor</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Přesunuje se váš účet Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Vytvořit účet Ring</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Připojit toto zařízení k účtu</translation>
@@ -1743,20 +1230,6 @@
         <translation>Vítejte v</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Vytvořit vlastní profil</translation>
@@ -1784,11 +1257,6 @@
         <translation>Hledá se...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Vytváří se váš účet Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Vytvořit účet Ring</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation>Jak přidat zařízení</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation>Vytvořit vlastní účet</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Vytváří se váš účet Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Přesunuje se váš účet Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_da.ts

diff --git a/translations/ring_client_windows_da.ts b/translations/ring_client_windows_da.ts
index e698004..c384fe6 100644
--- a/translations/ring_client_windows_da.ts
+++ b/translations/ring_client_windows_da.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Microsoft Windows klient til Ring.
-Ring er software til sikker og distribueret kommunikation.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Værtsnavn</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP aktiveret</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Tillad opkald fra ukendt</translation>
@@ -161,23 +169,12 @@
         <translation>Offentligt brugernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Offentligt registrerede Ring-brugernavn</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registrer på blockchain</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Skifter adgangskode ...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Indstillinger for Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Afspil</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Tilføj enhed</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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. Det vil generere en PIN-kode som skal indtastes på den nye enhed indenfor 5 minutter,</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Annuller</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Valider eksport på DHT for enhedstilknytnings-knap</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Eksporter til Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>Din genererede PIN-kode:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Brug standardcifre</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Vælg fil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Vent venligst mens din PIN genereres.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Netværksfejl. Prøv igen senere.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Forkert adgangskode.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registrerer... Det kan tage lidt tid</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>eller angiv nummer...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Overfør opkald-knap</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Overfør</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Søg efter kontakter eller indtast RingID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Tekstinput for søg efter kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Del ring-ID-knap</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dobbeltklik for at kopiere</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Fejl ved generering af QR-kode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Tilbage til hjemmeside-knap</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Tilføj til kontakt</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Vil tale med dig!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Ignorer indgående opkald-knap</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Besvar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Del ring-ID-knap</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dobbeltklik for at kopiere</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Fejl ved generering af QR-kode</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Tilbage til hjemmeside-knap</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Tilføj til kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Vil tale med dig!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Ignorer indgående opkald-knap</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Besvar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Fjern kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Bloker kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopiér nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Kontakt mig på Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mit RingID er:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Besked ankommet fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Indgående kald fra %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Generelt</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Konti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>afslut indstillingsmenu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Historik-indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Behold historik i (dage)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Sæt til 0 for ubegrænset historik)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Ryd historik</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Diverse indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Hold minimeret ved lukning</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Søg efter for opdateringer nu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Tekstinput for viste navn</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>ryd historik-knap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Optage-indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Gem i:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Optag altid</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Aktiver notifikationer</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Søg automatisk efter opdateringer hver</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dage</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Forhåndsvisning ikke tilgængelig under samtale</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Valg for enhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Enhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Opløsning</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Outputenhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Inputenhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>tilføj ny konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Slet konto-knap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Eksportér konto-knap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Eksport</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Start Ring ved opstart</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Ny konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Er du sikker på, at du vil slette al din historik?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Vælg folder</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Eksisterende kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>Tekstindtastning for søg efter eksisterende kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Søg...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Opret ny kontakt-knap</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Opret ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Tekstindtastning for nyt kontaktnavn</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Skriv navn her...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Opret</translation>
-    </message>
-</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>Indgående kontaktforespørgsel</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="87"/>
-        <source>nameLabel</source>
-        <translation>NavnEtiket</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="103"/>
-        <source>bestIdLabel</source>
-        <translation>bedsteIdEtiket</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accepter</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Fjern</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokér</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - konto sletning</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Er du sikker på, at du vil slette kontoen?</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Denne handling kan ikke fortrydes</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>Hvis denne konto ikke er blevet eksporteret, eller tilføjet til en anden enhed vil den blive mistet</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Slet</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Indstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Vælg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Ingen standard mail-klient fundet</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>KontaktID</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>TODO: Forklar formålet med en kontaktanmodning</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Send kontakt-forespørgsel</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Samtale parkeret</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Tilføj person til samtale</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Overfør samtale</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Sluk mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Optag opkald</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kvalitet</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Sammenføj samtaler</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Navne etiket</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tid gået</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Læg på</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Sluk mikrofon</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Del hele skærmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Del skærmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrerer din Ring-konto....</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-arkivfiler (*.gz);; Alle filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Opret Ring-konto</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For at forbinde denne enhed til en anden konto, skal du først &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;have fat i en PIN-kode.&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Generer en PIN-koden ved at:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Kontoindstillinger&lt;/span&gt; på en enhed der har kontoen&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-kontoen&lt;/span&gt; der skal bruges&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Enheder&lt;/span&gt;-fanebladet&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Tilføj enhed&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du vil nu få PIN-koden som skal indtastes her. Den er kun gyldig i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Opret din profil</translation>
@@ -1793,11 +1257,6 @@
         <translation>Søger...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registrer dit brugernavn i Ring. Det vil reservere brugernavnet så kun du kan anvende det. Dine venner vil være i stand til at ringe til dig ved brug af dette brugernavn, i stedet for dit RingID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1819,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Opret Ring-konto-knap</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1863,6 +1327,20 @@
         <translation>Tilknyt konto fra fil</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Vælg fil som skal importeres</translation>
@@ -1908,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Genererer din Ring-konto...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Opret Ring-konto-knap</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Opret Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Tilknyt enhed-knap</translation>
@@ -2098,29 +1566,6 @@
         <translation>Tilføjelse af enhed</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For at forbinde denne enhed til en anden konto, skal du først &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;have fat i en PIN-kode.&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Generer en PIN-koden ved at:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Kontoindstillinger&lt;/span&gt; på en enhed der har kontoen&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-kontoen&lt;/span&gt; der skal bruges&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Enheder&lt;/span&gt;-fanebladet&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Tilføj enhed&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du vil nu få PIN-koden som skal indtastes her. Den er kun gyldig i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Vælg fil som skal importeres</translation>
@@ -2182,9 +1627,38 @@
         <translation>Opret din konto</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registrer dit brugernavn i Ring. Det vil reservere brugernavnet så kun du kan anvende det. Dine venner vil være i stand til at ringe til dig ved brug af dette brugernavn, i stedet for dit RingID.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Genererer din Ring-konto...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrerer din Ring-konto....</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-arkivfiler (*.gz);; Alle filer (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

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 64f29d3..27b7208 100644
--- a/translations/ring_client_windows_da_DK.ts
+++ b/translations/ring_client_windows_da_DK.ts
@@ -31,10 +31,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Microsoft Windows klient til Ring.
-Ring er software til sikker og distribueret kommunikation.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -90,9 +89,13 @@
         <translation>Værtsnavn</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Brugernavn</translation>
     </message>
@@ -123,6 +126,11 @@
         <translation>UPnP aktiveret</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Tillad opkald fra ukendt</translation>
@@ -163,23 +171,12 @@
         <translation>Offentligt brugernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registrer på blockchain</translation>
     </message>
@@ -289,11 +286,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Indstillinger for Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"></translation>
@@ -320,7 +312,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Afspil</translation>
     </message>
@@ -590,9 +581,9 @@
         <translation>Tilføj enhed</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -616,14 +607,14 @@
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Eksporter til Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -695,46 +686,6 @@
         <source>Use default ciphers</source>
         <translation>Brug standardcifre</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Vælg fil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Vent venligst mens din PIN genereres.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Netværksfejl. Prøv igen senere.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Forkert adgangskode.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registrerer... Dette kan tage lidt tid</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -773,639 +724,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>eller angiv nummer...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Overfør</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Søg efter kontakter eller indtast RingID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dobbeltklik for at kopiere</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Fejl ved generering af QR code</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Tilføj til kontakt</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Vil tale med dig!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Besvar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dobbeltklik for at kopiere</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Fejl ved generering af QR code</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Tilføj til kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Vil tale med dig!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Besvar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Afvis</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopiér nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Kontakt mig på Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mit RingID er:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Besked ankommet fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Indgående kald fra %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Generelt</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Konti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>afslut indstillingsmenu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Historik-indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Behold historik i (dage)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Sæt til 0 for ubegrænset historik)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Ryd historik</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Diverse indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Hold minimeret ved lukning</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Søg efter for opdateringer nu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Optage-indstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Gem i:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Optag altid</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Aktiver notifikationer</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Søg automatisk efter opdateringer hver</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dage</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Forhåndsvisning ikke tilgængelig under samtale</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Valg for enhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Enhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Opløsning</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Output Enhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Input Enhed</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>tilføj ny konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Eksport</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Start Ring ved opstart</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Ny konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Er du sikker på, at du vil slette al din historik?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Vælg folder</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Eksisterende kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Søg...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Opret ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Skriv navn her...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Opret</translation>
-    </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>Indgående kontaktforespørgsel</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="87"/>
-        <source>nameLabel</source>
-        <translation>NavnEtiket</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="103"/>
-        <source>bestIdLabel</source>
-        <translation>bedsteIdEtiket</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accepter</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Fjern</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokér</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - konto sletning</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Er du sikker på, at du vil slette kontoen?</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Denne handling kan ikke fortrydes</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>Hvis denne konto ikke er blevet eksporteret, eller tilføjet til en anden enhed vil den blive mistet</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annuller</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1428,25 +966,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation type="unfinished">Indstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Afslut</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1502,12 +1040,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished">Vælg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished">Filer (*)</translation>
     </message>
@@ -1515,35 +1053,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Ingen standard mail-klient fundet</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1554,32 +1089,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>KontaktID</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>TODO: Forklar formålet med en kontaktanmodning</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Send kontakt-forespørgsel</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Samtale parkeret</translation>
     </message>
@@ -1594,52 +1106,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Tilføj person til samtale</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Overfør samtale</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Sluk mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kvalitet</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Sammenføj samtaler</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Navne etiket</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tid gået</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
@@ -1649,7 +1141,7 @@
         <translation>Læg på</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Sluk mikrofon</translation>
     </message>
@@ -1657,17 +1149,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Del hele skærmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Del skærmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1681,8 +1173,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrerer din Ring-konto....</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1721,15 +1213,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Opret Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Tilknyt denne enhed til en konto</translation>
@@ -1745,29 +1232,6 @@
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For at forbinde denne enhed til en anden konto, skal du først &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;have fat i en PIN-kode.&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Sådan genereres 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Kontoindstillinger &lt;/span&gt; på en enhed der har kontoen&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-kontoen&lt;/span&gt; der skal bruges&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Enheder&lt;/span&gt;-fanebladet&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Tilføj enhed&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du vil nu få PIN-koden som skal indtastes her. Den er kun gyldig i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Opret din profil</translation>
@@ -1795,11 +1259,6 @@
         <translation>Søger...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registrer dit brugernavn i Ring. Dette vil reservere brugernavnet så kun du kan anvende det. Dine venner vil være i stand til at ringe til dig ved brug af dette brugernavn, i stedet for dit RingID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"></translation>
@@ -1821,12 +1280,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1865,6 +1329,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -1910,6 +1388,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
@@ -1978,8 +1461,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Genererer din Ring-konto...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2040,21 +1523,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Opret Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
@@ -2100,29 +1568,6 @@
         <translation>Sådan tilføjes en enhed</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For at forbinde denne enhed til en anden konto, skal du først &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;have fat i en PIN-kode.&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Sådan genereres 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Kontoindstillinger &lt;/span&gt; på en enhed der har kontoen&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-kontoen&lt;/span&gt; der skal bruges&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Enheder&lt;/span&gt;-fanebladet&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vælg &lt;span style=&quot; font-weight:600;&quot;&gt;Tilføj enhed&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du vil nu få PIN-koden som skal indtastes her. Den er kun gyldig i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -2184,9 +1629,38 @@
         <translation>Opret din konto</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registrer dit brugernavn i Ring. Dette vil reservere brugernavnet så kun du kan anvende det. Dine venner vil være i stand til at ringe til dig ved brug af dette brugernavn, i stedet for dit RingID.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2268,8 +1742,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Genererer din Ring-konto...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2308,8 +1782,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrerer din Ring-konto....</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2348,7 +1822,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/ring_client_windows_de.ts

diff --git a/translations/ring_client_windows_de.ts b/translations/ring_client_windows_de.ts
index e3fa0e9..c97598f 100644
--- a/translations/ring_client_windows_de.ts
+++ b/translations/ring_client_windows_de.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Die Microsoft Windows Oberfläche für Ring.
-Ring ist eine sichere und verteilte Kommunikationsanwendung.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Rechnername</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP aktiviert</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Anruf von Unbekannt erlauben</translation>
@@ -161,23 +169,12 @@
         <translation>Öffentlicher Benutzername</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Den Benutzernamen auf der Blockchain registrieren.</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring-Kontoeinstellungen</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Abspielen</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Gerät hinzufügen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Zu Ring exportieren</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Standardcipher verwenden</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>Ring-ID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Datei auswählen</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Dateien (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Bitte warte, während wir deine neue PIN generieren.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Netzwerkfehler, bitte später nochmal versuchen.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Falsches Passwort.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registriere... Kann eine Weile dauern</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>oder Nummer eingeben...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transfer</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Kontakte suchen oder Nummer eingeben</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Unterhaltungen</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>Doppelklick zum kopieren</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Fehler bei der Erstellung des QR-Codes</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Zu Kontakten hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Möchte mit dir Sprechen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Antwort</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Doppelklick zum kopieren</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Fehler bei der Erstellung des QR-Codes</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Zu Kontakten hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Möchte mit dir Sprechen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Antwort</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Entferne Kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Kontaktieren Sie mich über Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Meine Ring-ID ist:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Eingehende Nachricht von %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Eingehender Anruf von %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Konten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>Einstellungen verlassen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Verlaufseinstellungen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Verlauf behalten für (Tage)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Auf 0 setzen für einen unbegrenzten Verlauf)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Verlauf leeren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Andere Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Beim Schließen minimiert bleiben</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Aktualisieren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Aufnahme-Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Speichern unter:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Immer aufnehmen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Benachrichtigungen aktivieren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Automatisch auf Aktualisierungen prüfen. Alle</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>Tage</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Vorschau während Anruf nicht verfügbar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Geräteauswahl</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Gerät</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Auflösung</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Ausgabegerät</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Aufnahmegerät</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>Neues Konto hinzufühgen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Export</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Ring beim Hochfahren starten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Neues Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Sind sie sicher das sie den gesamten Verlauf leeren möchten?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Verzeichnis wählen</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Existierendes Konto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Suchen...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Neuen Kontakt erstellen</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Neuer Kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Hier einen Namen eingeben...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Erstellen</translation>
-    </message>
-</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>Kontaktanfrage</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Akzeptieren</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Verwerfen</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Sperren</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - Kontolöschung</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Möchten Sie Ihr Konto wirklich löschen?</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Diese Aktion ist unwiderruflich</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>Falls dieses Konto nicht exportiert oder auf ein anderes Gerät übertragen wurde, wird es verloren gehen</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Schliessen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Datei auswählen</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Dateien (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Kein Standardprogramm für E‑Mail gefunden</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automatisch</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>KontaktID</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>TODO: Erkläre den Zweck einer Kontaktanfrage</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Sende eine Kontaktanfrage</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Anruf pausiert</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Person zum Anruf hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Anruf übertragen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Mikrofon stummschalten</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Qualität</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Anruf beitreten</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Namenslabel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Zeit vergangen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Einstellungen</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Auflegen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Video stummschalten</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Gesamten Bildschirm teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Bildschirmbereich teilen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Datei teilen</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Ihr RIng-Konto wird migriert...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ein Ring-Konto erstellen</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Dieses Gerät mit einem Konto verknüpfen</translation>
@@ -1743,20 +1230,6 @@
         <translation>Willkommen bei</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>1</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Erstellen Sie Ihr Profil</translation>
@@ -1784,11 +1257,6 @@
         <translation>Suchen...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registriere deinen Benutzernamen bei Ring. Dadurch wird der Benutzername reserviert, sodass nur du ihn benutzen kannst. Deine Freunde werden die Möglichkeit haben dich mit Hilfe deines Benutzernamens anzurufen anstatt dafür deine RingID zu benutzen.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ihr Ring-Konto wird generiert...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ein Ring-Konto erstellen</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation>Wie kann ich ein neues Gerät hinzufügen</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>1</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,9 +1627,38 @@
         <translation>Legen Sie ein Benutzerkonto an</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registriere deinen Benutzernamen bei Ring. Dadurch wird der Benutzername reserviert, sodass nur du ihn benutzen kannst. Deine Freunde werden die Möglichkeit haben dich mit Hilfe deines Benutzernamens anzurufen anstatt dafür deine RingID zu benutzen.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ihr Ring-Konto wird generiert...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Ihr RIng-Konto wird migriert...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 0bad583..982054c 100644
--- a/translations/ring_client_windows_de_DE.ts
+++ b/translations/ring_client_windows_de_DE.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>Hostname</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Benutzername</translation>
     </message>
@@ -121,6 +125,11 @@
         <translation>UPnP aktiviert</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -161,23 +170,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +285,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +311,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Wiedergeben</translation>
     </message>
@@ -588,8 +580,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +606,13 @@
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +685,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Falsches Passwort.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +723,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Übertragung</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Kontakte hinzufügen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Antwort</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Kontakte hinzufügen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Antwort</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Nummer kopieren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Einstellungen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Allgemein</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Kontos</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>Tage</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Gerät</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportieren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Neuer Kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Erstellen</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Akzeptieren</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blockieren</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Löschen</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Abbrechen</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +965,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Über</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1039,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,33 +1052,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1552,32 +1088,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1105,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
@@ -1647,7 +1140,7 @@
         <translation>Auflegen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1655,17 +1148,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1679,7 +1172,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1212,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1231,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1258,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1279,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1328,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1387,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,7 +1460,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2029,21 +1522,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1567,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1628,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,7 +1741,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2288,7 +1781,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1821,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_el.ts

diff --git a/translations/ring_client_windows_el.ts b/translations/ring_client_windows_el.ts
index 175c3df..ed9b7c6 100644
--- a/translations/ring_client_windows_el.ts
+++ b/translations/ring_client_windows_el.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>Hostname</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Όνομα χρήστη</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP ενεργοποίηση</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Αναπαραγωγή</translation>
     </message>
@@ -587,9 +579,9 @@
         <translation>Προσθήκη συσκευής</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -613,14 +605,14 @@
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Εξαγωγή στο Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Χρήση προκαθορισμένων αλγόριθμων κρυπτογράφησης</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Μεταφορά</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Συνομιλίες</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Προσθήκη στις επαφές</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Προσθήκη στις επαφές</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Αντιγραφή αριθμού </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Γενικά</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Ήχος/Βίντεο</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Λογαριασμοί</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Ρυθμίσεις ιστορικού</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Προφίλ</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Όνομα</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Συσκευή</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Εξαγωγή</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Νέος λογαριασμός</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Αναζήτηση...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Δημιουργία νέας επαφής</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Νέα επαφή</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Εισάγετε ένα όνομα εδώ...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Αποδοχή</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Μπλοκάρισμα</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Ακύρωση</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Εντάξει</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Ρυθμίσεις</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Έξοδος</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Περί</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation>Συνομιλία</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Ρυθμίσεις</translation>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Μοίρασμα περιοχής της οθόνης</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Μοίρασμα αρχείου</translation>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Γίνεται δημιουργία του λογαριασμού σας Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Γίνεται δημιουργία του λογαριασμού σας Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_en_GB.ts

diff --git a/translations/ring_client_windows_en_GB.ts b/translations/ring_client_windows_en_GB.ts
index 7e723bb..ea8c488 100644
--- a/translations/ring_client_windows_en_GB.ts
+++ b/translations/ring_client_windows_en_GB.ts
@@ -31,8 +31,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -89,9 +89,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,6 +126,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
@@ -162,23 +171,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,11 +286,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"></translation>
@@ -319,7 +312,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
@@ -589,8 +581,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -615,13 +607,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -694,46 +686,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -772,639 +724,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Name</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1427,25 +966,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1501,12 +1040,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1514,33 +1053,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1553,32 +1089,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1593,52 +1106,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1648,7 +1141,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,17 +1149,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1680,7 +1173,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1720,12 +1213,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1744,20 +1232,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"></translation>
@@ -1785,11 +1259,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"></translation>
@@ -1811,12 +1280,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1855,6 +1329,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -1900,6 +1388,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
@@ -1968,7 +1461,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2030,21 +1523,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
@@ -2090,20 +1568,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -2165,8 +1629,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2249,7 +1742,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2289,7 +1782,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2329,7 +1822,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/ring_client_windows_eo.ts

diff --git a/translations/ring_client_windows_eo.ts b/translations/ring_client_windows_eo.ts
index 3fbce16..fd7cfb6 100644
--- a/translations/ring_client_windows_eo.ts
+++ b/translations/ring_client_windows_eo.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>La Microsoft Windows kliento por Ring.
-Ring estas sekura kaj disa komunikprogramo.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Nomo de gastiga komputilo</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Uzantnomo</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP ŝaltita</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Permesi Vokojn de Nekonataj</translation>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Agordoj de Ring Konto</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Ludi</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Aldoni aparaton</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Elporti sur Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Uzi defaŭltajn ĉifrojn</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Paŭzo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Elektu dosieron</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Dosieroj (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>aŭ tajpu numeron...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transigi</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Serĉu kontaktojn aŭ entajpu Ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Konversacioj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Eraro dum generado de QR Kodo</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Aldoni al kontaktoj</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Volas paroli kun vi!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Respondi</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Eraro dum generado de QR Kodo</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Aldoni al kontaktoj</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Volas paroli kun vi!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Respondi</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Malatenti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopii numeron</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Kontaktu min per Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mia RingID estas:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Mesaĝo eniranta de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Voko eniranta de %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Agordoj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Ĝenerala</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Aŭdio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Kontoj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>Eliri el menuo de agordoj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Historiaj agordoj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Savu historion dum (tagoj)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Agordu 0 por senlima historio)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Vakigi Historion</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Diversaj Agordoj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Ne ĉesu pro fermado fenestron</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profilo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nomo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Agordoj de Registrado</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Konservi en :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Ĉiam registri</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Aŭtomate kontroli ĝisdatigojn po</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>tagoj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Aspekto nehavebla dum voko</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Selekto de Aparato</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Aparato</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Distingivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Eliga aparato</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Eniga aparato</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>Aldoni novan konton</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Elporti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Lanĉi Ring Post Startigo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nova Konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Ĉu vi certe volas vakigi vian tutan historion?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Elektu dosierujon</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Ekzistanta Kontakto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Serĉu...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Krei novan kontakton</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nova Kontakto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Entajpu nomon tie ĉi...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Krei</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Akcepti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Rezigni</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Okej</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Agordo</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Eliri</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Pri</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Elektu dosieron</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Dosieroj (*)</translation>
     </message>
@@ -1513,37 +1051,34 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Neniu defaŭlta retpoŝta kliento trovita</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Aŭtomata</translation>
-    </message>
-</context>
-<context>
     <name>RingButton</name>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Voko detenita</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Babilo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Aldoni personon al voko</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Transigi vokon</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Selentigi Mikrofonon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kvalito</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Kunligi Vokojn</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Noma etikedo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Pasinta tempo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Agordo</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Fini Vokon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Silentigi Videon</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Kunhavigi tutan ekranon</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Kunhavigi areon de ekrano</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Kunhavigi dosieron</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generanta vian Ring-an konton...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generanta vian Ring-an konton...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_es.ts

diff --git a/translations/ring_client_windows_es.ts b/translations/ring_client_windows_es.ts
index 854daba..2aeaa1c 100644
--- a/translations/ring_client_windows_es.ts
+++ b/translations/ring_client_windows_es.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>El cliente Ring para Microsoft Windows
-Ring es un programa de comunicación distribuido y seguro.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Nombre del host</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nombre de usuario</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP habilitado</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Permitir llamadas desconocidas</translation>
@@ -161,23 +169,12 @@
         <translation>Usuario público</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Nombre de usuario público registrado en Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Registrar Nombre de usuario en el botón blockchain</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registrarse en blockchain</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Cambiando contraseña ...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Configuración de la cuenta Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Agregar dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exportar en Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Usar cifrados por defecto</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pausar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Examinar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Ficheros (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Espere mientras se genera su PIN.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <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="331"/>
-        <source>Wrong password.</source>
-        <translation>Contraseña errónea</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registrando... Puede tardar un poco de tiempo</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>Lista de contactos existentes</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>o escribe el número...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transferir</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Buscar contacto o introducir número</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Mostrar la Ring ID como código QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Botón de compartir el ID de Ring</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Doble click para copiar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <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="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Añadir a contactos</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>¡Quiere charlar contigo!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Contestar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Mostrar la Ring ID como código QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Botón de compartir el ID de Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Doble click para copiar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <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="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Añadir a contactos</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>¡Quiere charlar contigo!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Contestar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar llamada saliente</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
-        <source>Block contact</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Eliminar contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="305"/>
+        <source>Block contact</source>
+        <translation>Bloquear contacto</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copiar Número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contactame por Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mi RingID es:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Recibido mensaje de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Llamada entrante de %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Pestaña de configuración general</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Pestaña de configuración de Audio / Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Pestaña de configuración de cuentas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Cuentas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>Cerrar menú de configuración</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Configuración del Historial</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Guardar Historial durante (días)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Dejar en 0 para historial ilimitado)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Limpiar historial</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Configuraciones Miscelaneas </translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Mantener minimizado al cerrar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Buscar actualizaciones ahora</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (clic para cambiar)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>Botón de limpiar historial</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Configuración de grabación</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Guardar en:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Grabar siempre</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Habilitar notificaciones</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Buscar actualizaciones automáticamente cada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dias</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Vista previa no disponible durante la llamada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Seleccionar dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Resolución</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Dispositivo de salida</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Dispositivo de entrada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>Aggregar cuenta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Botón de eliminar cuenta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Iniciar Ring automáticamente</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nueva cuenta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>¿Estás seguro de que quieres limpiar todo el historial?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Elige directorio</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Contacto existente</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Buscar...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>Lista de contactos existentes</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Botón de crear nuevo contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Crear un nuevo contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nuevo Contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Introduce un nombre...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Crear</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation>Botón de aceptar la solicitud de contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aceptar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Solicitud de silenciar contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Descartar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Solicitud de bloqueo de contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bloquear</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - eliminar cuenta</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>¿Realmente desea eliminar la cuenta?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Esta acción es irrevocable</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Si esta cuenta no se ha exportado, ó agregada a otro dispositivo, se perderá</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Botón de cancelar la eliminación del contacto</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Borrar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Botón de validar la eliminación del contacto</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Aceptar</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation>Configuración</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Examinar</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Ficheros (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <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="37"/>
-        <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Casilla de calidad automática</translation>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.cpp" line="37"/>
+        <location filename="../wizardwidget.cpp" line="37"/>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulario</translation>
-    </message>
-    <message>
-        <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>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Llamada en espera</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Añadir otra persona a la llamada</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Transferir llamada</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Silenciar micrófono</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Grabar llamada</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Calidad</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Unirse a la llamada</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Etiqueta de nombre</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tiempo transcurrido</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Cortar</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Silenciar Video</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Compartir toda la pantalla</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Compartir la ventana</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Compartir archivo</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrando su cuenta de Ring...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Crear cuenta de Ring</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Conectar este dispositivo a una cuenta</translation>
@@ -1743,29 +1230,6 @@
         <translation>Bienvenido(a) a</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Usted necesita obtener un PIN para poder unir este  &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;dispositivo con otra cuenta&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; . Para generar el 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vaya a &lt;span style=&quot; font-weight:600;&quot;&gt;Manejo de cuenta configuración&lt;/span&gt; of a dispositivo anterior&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Elija la &lt;span style=&quot; font-weight:600;&quot;&gt;cuenta Ring &lt;/span&gt; que desea utilizar&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vaya al &lt;span style=&quot; font-weight:600;&quot;&gt;Dispositivo&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Seleccione &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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Necesitará el PIN para completar el formulario. El PIN es válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Crea tu perfil</translation>
@@ -1793,11 +1257,6 @@
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registre su nombre de usuario en Ring. Esto reservará el nombre de usuario para que solo tú puedas usarlo. Sus amigos podrán llamarle con su nombre de usuario en lugar de usar su RingID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1819,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Botón de crear cuenta de Ring</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1863,6 +1327,20 @@
         <translation>Vincule cuenta desde archivo</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Seleccione el archivo a importar</translation>
@@ -1908,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generando tu cuenta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Logo de Bienvenida</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Botón de crear cuenta de Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Crear cuenta de Ring</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Botón de vincular dispositivo</translation>
@@ -2098,29 +1566,6 @@
         <translation>Cómo agregar un dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Usted necesita obtener un PIN para poder unir este  &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;dispositivo con otra cuenta&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; . Para generar el 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vaya a &lt;span style=&quot; font-weight:600;&quot;&gt;Manejo de cuenta configuración&lt;/span&gt; of a dispositivo anterior&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Elija la &lt;span style=&quot; font-weight:600;&quot;&gt;cuenta Ring &lt;/span&gt; que desea utilizar&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vaya al &lt;span style=&quot; font-weight:600;&quot;&gt;Dispositivo&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Seleccione &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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Necesitará el PIN para completar el formulario. El PIN es válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Seleccione el archivo a importar</translation>
@@ -2182,9 +1627,38 @@
         <translation>Crea tu cuenta</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generando tu cuenta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrando su cuenta de Ring...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_es_AR.ts

diff --git a/translations/ring_client_windows_es_AR.ts b/translations/ring_client_windows_es_AR.ts
index ca12c82..a7f9795 100644
--- a/translations/ring_client_windows_es_AR.ts
+++ b/translations/ring_client_windows_es_AR.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>El cliente de Microsoft Windows para Ring.
-Ring es un software de comunicación seguro y distribuido.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Nombre del anfitrión</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nombre de usuario</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP habilitado</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Permitir Llamadas de Desconocidos</translation>
@@ -161,23 +169,12 @@
         <translation>Nombre de usuario público</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Nombre de usuario público registrado de Ring.</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation>Cambiando contraseña</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ajustes de Cuenta de Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Reproducir</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Añadir dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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 añadir un nuevo dispositivo a tu cuenta de Ring,  podes exportar tu cuenta de Ring. Esto generará un pin que debe ser ingresado en tu nuevo dispositivo dentro de 5 minutos desde su generación</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,13 +605,13 @@
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Archivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Contraseña incorrecta.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversaciones</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring es software libre para comunicación universal que respeta las libertades y privacidad de sus usuarios.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>Doble click para copiar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Error al generar el Código QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Agregar a contactos</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>¡Quiere hablar con vos!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Doble click para copiar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Error al generar el Código QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Agregar a contactos</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>¡Quiere hablar con vos!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contactame en Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mi RingID es:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Mensaje entrante de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Llamada entrante de %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Ajustes</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Cuentas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Ajustes de Historial</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Mantener Historial por (días)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Limpiar Historial</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (click para cambiar)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nombre</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Guardar en:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Habilitar notificaciones</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>días</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Selección de Dispositivos</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Selector de dispositivo de video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Resolución</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Dispositivo de Salida</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Dispositivo de Entrada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Iniciar Ring al inicio</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nueva Cuenta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>¿Estás seguro de querer limpiar todo tu historial?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Elegir Directorio</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Contacto Existente</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Crear nuevo contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nuevo Contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Crear</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aceptar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Descartar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bloquear</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - eliminación de cuenta</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </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 ha sido exportada, o añadida a otro dispositivo, se perderá</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Okay</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Ajustes</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuración</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Archivos (*)</translation>
     </message>
@@ -1513,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation>Cuenta Ring</translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1552,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Caidad</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuración</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Compartir archivo</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,29 +1230,6 @@
         <translation>Bienvenido a</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para enlazar este dispositivo a otra cuenta, primero &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;necesitás obtener un código&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; PIN. 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ve a los &lt;span style=&quot; font-weight:600;&quot;&gt;Ajustes de administración de cuenta&lt;/span&gt; de un dispositivo previo&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Elegí la &lt;span style=&quot; font-weight:600;&quot;&gt;cuenta Ring&lt;/span&gt; que quieras usar&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ve a la pestaña &lt;/li&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dispositivos&lt;/span&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Seleccioná &lt;span style=&quot; font-weight:600;&quot;&gt;Añadir un 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Obtendrás el PIN necesario para completar este formulario. El PIN sólo es valido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Creá tu perfil</translation>
@@ -1793,11 +1257,6 @@
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <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>Registrá tu nombre de usuario en Ring. Esto reservará el nombre de usuario para que sólo vos podás usarlo. Tus amigos podrán llamarte con tu nombre de usuario en lugar de usar tu RingID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1819,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1863,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Seleccioná el archivo para importar</translation>
@@ -1908,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generando tu cuenta de Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2098,29 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para enlazar este dispositivo a otra cuenta, primero &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;necesitás obtener un código&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; PIN. 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ve a los &lt;span style=&quot; font-weight:600;&quot;&gt;Ajustes de administración de cuenta&lt;/span&gt; de un dispositivo previo&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Elegí la &lt;span style=&quot; font-weight:600;&quot;&gt;cuenta Ring&lt;/span&gt; que quieras usar&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ve a la pestaña &lt;/li&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Dispositivos&lt;/span&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Seleccioná &lt;span style=&quot; font-weight:600;&quot;&gt;Añadir un 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Obtendrás el PIN necesario para completar este formulario. El PIN sólo es valido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Seleccioná el archivo para importar</translation>
@@ -2182,9 +1627,38 @@
         <translation>Creá tu cuenta</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>Registrá tu nombre de usuario en Ring. Esto reservará el nombre de usuario para que sólo vos podás usarlo. Tus amigos podrán llamarte con tu nombre de usuario en lugar de usar tu RingID.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generando tu cuenta de Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2346,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_et_EE.ts

diff --git a/translations/ring_client_windows_et_EE.ts b/translations/ring_client_windows_et_EE.ts
index 95272fb..dab0942 100644
--- a/translations/ring_client_windows_et_EE.ts
+++ b/translations/ring_client_windows_et_EE.ts
@@ -31,8 +31,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -89,9 +89,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,6 +126,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
@@ -162,23 +171,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,11 +286,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"></translation>
@@ -319,7 +312,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Mängi</translation>
     </message>
@@ -589,8 +581,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -615,13 +607,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -694,46 +686,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -772,639 +724,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>vasta</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>vasta</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1427,25 +966,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1501,12 +1040,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1514,33 +1053,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1553,32 +1089,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1593,52 +1106,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1648,7 +1141,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,17 +1149,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1680,7 +1173,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1720,12 +1213,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1744,20 +1232,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"></translation>
@@ -1785,11 +1259,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"></translation>
@@ -1811,12 +1280,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1855,6 +1329,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -1900,6 +1388,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
@@ -1968,7 +1461,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2030,21 +1523,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
@@ -2090,20 +1568,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -2165,8 +1629,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2249,7 +1742,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2289,7 +1782,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2329,7 +1822,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/ring_client_windows_eu.ts

diff --git a/translations/ring_client_windows_eu.ts b/translations/ring_client_windows_eu.ts
index 8a8d79e..4a1ba3c 100644
--- a/translations/ring_client_windows_eu.ts
+++ b/translations/ring_client_windows_eu.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
@@ -120,6 +124,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>Ezeztatu</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transferitu</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Orokorra</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Gailua</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Ezabatu</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Ezeztatu</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Honi buruz</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 fb0ed9b..a6a4871 100644
--- a/translations/ring_client_windows_fa_IR.ts
+++ b/translations/ring_client_windows_fa_IR.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>نسخه رینگ برای مایکروسافت ویندوز
-رینگ یک نرم‌افزار ارتباطی امن و توزیع شده است.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>نام میزبان</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>نام کاربری</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP فعال شد</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>اجازه تماس به افراد نانشاخته</translation>
@@ -161,23 +169,12 @@
         <translation>نام کاربری عمومی</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>نام کاربری ثبت شده عمومی رینگ</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>ثبت نام روی بلاکپچین</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>در حال تغییر گذرواژه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>تنظیمات حساب رینگ</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>پخش</translation>
     </message>
@@ -588,8 +579,8 @@
         <translation>افزودن دستگاه</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>مکث</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>انتخاب فایل</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>فایل‌ها (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>خطا شبکه. لطفا بعدا امتحان کنید.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>کلمه عبور اشتباه است.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>در حال ثبت... ممکن است مدتی زمان ببرد</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>لیست مخاطبان موجود</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>یا شماره بنویسید...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>انتقال دکمه تماس</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>انتقال</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>جستجو مخاطبان یا وارد کردن آیدی رینگ</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>نمایش مکالمات</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation> گفتگو</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>به اشتراک گذاری دکمه آیدی رینگ</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>برای کپی کردن دو بار کلیک کنید</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>خطا در هنگام تولید کد QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>افزودن به مخاطبان</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>نمایش دعوت ها</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>دعوت ها</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>میخواهد با شما حرف بزند!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>دکمه پاسخ به تماس ورودی</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>پاسخ</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>به اشتراک گذاری دکمه آیدی رینگ</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>برای کپی کردن دو بار کلیک کنید</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>خطا در هنگام تولید کد QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>افزودن به مخاطبان</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>نمایش دعوت ها</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>دعوت ها</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>میخواهد با شما حرف بزند!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>دکمه پاسخ به تماس ورودی</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>پاسخ</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>رد</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>لغو تماس خروجی</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>شروع تماس ویدیویی</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>شروع مکالمه صوتی</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>پاک کردن مکالمه</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>حذف مخاطب</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>مسدودسازی مخاطب</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>رونوشت از شماره</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>تماس با من توسط رینگ</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>پیام دریافتی از 1%</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>تماس ورودی از %1</translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation>زبانه پیکربندی همگانی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>همگانی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>زبانه پیکربندی صدا /  تصویر</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>صدا/تصویر</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>زبانه پیکربندی حساب‌ها</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>حساب‌ها</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>منوی تنظیمات را ترک کنید</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>تنظیمات تاریخچه</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>نگه داشتن تاریخچه برای (روز)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(برای تنظیم تاریخچه به صورت نامحدود 0 قرار دهید)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>پاک کردن تاریخچه</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>تنظیمات متفرقه</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>نمایه</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>آواتار ( برای تغییر کلیک کنید)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>نام</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>تعداد روزهایی که تاریخچه نگه داشته می شود</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>دکمه پاکسازی تاریخچه</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>تنظیمات ضبط</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>ذخیره در :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>همیشه ضبط کن</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>فعال سازی نوتیفیکیشن ها</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>روز</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>دکمه همین الان برروزرسانی ها را چک کن</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>انتخاب دستگاه</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>انتخاب کننده دستگاه ویدیو</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>دستگاه</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>کیفیت</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>انتخاب کننده کیفیت دستگاه ویدیویی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>دستگاه خروجی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>انتخاب کننده دستگاه خروجی صوتی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>دستگاه ورودی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>انتخاب کننده دستگاه ورودی صوتی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>انتخاب کننده نوع حساب کاربری جدید</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>افزودن حساب کاربری جدید</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>دکمه حذف حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>برون‌ریزی</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>حساب جدید</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>آیا مطمئن هستید که میخواهید تمام تاریخچه خود را پاک کنید؟</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>انتخاب دایرکتوری</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>مخاطب موجود</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>جستجو...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>لیست مخاطبان موجود</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>دکه ایجاد یک مخاطب جدید</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>ایجاد یک مخاطب</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>مخاطب نو</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>اینجا یک نام وارد کنید...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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>درخواست دریافتی مخاطب</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>پذیرش</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>مسدود</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>رینگ - حذف حساب کاربری</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>آیا واقعا میخواهید حساب کاربری خود را پاک کنید؟</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>این عمل غیرقابل بازگشت می باشد</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>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>دکمه لغو حذف حساب</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>حذف</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>لغو</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>باشه</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>رینگ</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>تنظیمات</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>پکربندی</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>خروج</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>درباره</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>انتخاب فایل</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>فایل‌ها (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>اسلایدر کیفیت</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>خودکار</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../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>ارسال درخواست مخاطب</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>چت</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>افزودن شخص به تماس</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>ضبط تماس</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>کیفیت</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>نامگذاری برچسب</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>زمان سپری شده</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>پکربندی</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>به صحبت تلفنی خاتمه دادن</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>بی‌صدا کردن ویدیو</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>به اشتراک گذاری تمام صفحه نمایش</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>هم‌رسانی پرونده</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>جابجایی حساب کاربری رینگ شما...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>ایجاد حساب کاربری رینگ</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>پیوند این افزاره به یک حساب</translation>
@@ -1743,20 +1230,6 @@
         <translation>خوش آمدید به</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>نمایه خود را بسازید</translation>
@@ -1784,11 +1257,6 @@
         <translation>در حال جستجو...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>دکمه ایجاد حساب کاربری رینگ</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation>پیوند حساب از فایل</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>ایجاد حساب کاربری شما...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation>لوگو خوش آمد</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>دکمه ایجاد حساب کاربری رینگ</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>ایجاد حساب کاربری رینگ</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>دکمه پیوند دستگاه</translation>
@@ -2089,20 +1566,6 @@
         <translation>چگونه یک دستگاه جدید اضافه کنیم</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation>حساب کاربری خود را بسازید</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>ایجاد حساب کاربری شما...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>جابجایی حساب کاربری رینگ شما...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_fi.ts

diff --git a/translations/ring_client_windows_fi.ts b/translations/ring_client_windows_fi.ts
index af73e47..c26e32b 100644
--- a/translations/ring_client_windows_fi.ts
+++ b/translations/ring_client_windows_fi.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Ring-asiakasohjelma Microsoft Windowsille.
-Ring on turvallinen ja hajautettu viestintäsovellus.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Yhteysosoite</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Käyttäjänimi</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP päällä</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Salli puhelut tuntemattomilta</translation>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Rekisteröi lohkoketjuun</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Vaihdetaan salasanaa ...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring tunnuksen asetukset</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Toista</translation>
     </message>
@@ -588,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Tauota</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Valitse tiedosto</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Tiedostot (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>tai näppäile numero...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Lähetys</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Keskustelu</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Virhe generoidessa QR-koodia</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Lisää yhteystietoihin</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Haluaa puhua kanssasi!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Vastaa</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Virhe generoidessa QR-koodia</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Lisää yhteystietoihin</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Haluaa puhua kanssasi!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Vastaa</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Sivuuta</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopioi numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Ota yhteyttä minuun Ringillä</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Ring tunnisteeni on:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Saapuva puhelu %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Asetukset</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Yleiset</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Ääni/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Tunnukset</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Historian asetukset</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Säilytä historiassa (päivää)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(0 tarkoittaa rajoittamatonta historiaa)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Soittohistoria</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Mikrofoniasetukset</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Pidä pinennettynä suljettaessa</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profiili</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nimi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Tallenneasetukset</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Tarkista päivitykset automaattisesti joka</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>päivä</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Laitevalinta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Laite</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Tarkkuus</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>lisää uusi tunnus</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Vie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Uusi tunnus</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Oletko varma että haluat tyhjentää koko historiasi?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Valitse hakemisto</translation>
-    </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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Etsi...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Luo uusi yhteystieto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Uusi yhteystieto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Syötä nimi tähän...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Luo</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Hyväksy</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Poista</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Peru</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Vahvista</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Määrittelyt</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Poistu</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Tietoa</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Valitse tiedosto</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Tiedostot (*)</translation>
     </message>
@@ -1513,37 +1051,34 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Oletussähköpostiohjelmaa ei löytynyt</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automaattinen</translation>
-    </message>
-</context>
-<context>
     <name>RingButton</name>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
@@ -1552,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Puhelu pidossa</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>keskustelu</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Lisää henkilö puheluun</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Siirrä puhelu</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Mykistä mikki</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Laatu</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Liity puheluihin</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Nimikenttä</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Määrittelyt</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Katkaisu</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Tauota video</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Jaa näyttö</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Jaa osa näytöstä</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Jaa tiedosto</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1257,6 @@
         <translation>Etsitään...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_fr.ts

diff --git a/translations/ring_client_windows_fr.ts b/translations/ring_client_windows_fr.ts
index 9c78d3b..ab0d696 100644
--- a/translations/ring_client_windows_fr.ts
+++ b/translations/ring_client_windows_fr.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Le client Windows de Ring
-Ring est un logiciel de communication sécurisé et distribué.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Nom d&apos;hôte</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP activé</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Autoriser les appels de personnes inconnues</translation>
@@ -161,23 +169,12 @@
         <translation>Nom d’utilisateur publique</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Notifiez un usager enregistré publiquement</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Enregistrez le nom d&apos;usager sur le blockchain.</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Enregistrer sur la blockchain</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Modification de mot de passe...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Paramètres Compte Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Checkbox permettant l&apos;appel d&apos;un étranger</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Lire</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Ajouter un nouvel appareil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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 NIP qui devra être saisi sur le nouvel appareil dans les 5 minutes suivant sa génération.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Annuler</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Valider l&apos;exportation sur DHT pour le boutton de l&apos;appareil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exporter sur le Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>Votre NIP généré :</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Utiliser les modes de chiffrements par défaut</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Choisir un fichier</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Fichiers (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Veuillez patienter pendant que votre NIP est généré.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Erreur réseau, veuillez réessayer.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Mauvais mot de passe.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Enregistrement... Cela peut prendre un peu de temps</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>Liste de contacts existante </translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>entrée de texte numéro de transfert de contact</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ou taper le numéro...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>bouton de transfert d&apos;appel </translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transférer</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Rechercher dans les contacts ou entrer un ringID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>Montrer les conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Rechercher le texte du contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Montrer le code QR d&apos;identification ring </translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Partager le bouton d&apos;identification ring </translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Double-cliquez pour copier</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <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="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Bouton de retour a la page d&apos;accueil</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Ajouter aux contacts</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>Montrer les invitations</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>Invitations</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>souhaite entrer en communication !</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Bouton de réponse d&apos;appel </translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Bouton de refus d&apos;appel </translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Répondre</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Montrer le code QR d&apos;identification ring </translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Partager le bouton d&apos;identification ring </translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Double-cliquez pour copier</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <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="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Bouton de retour a la page d&apos;accueil</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Ajouter aux contacts</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>Montrer les invitations</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>Invitations</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>souhaite entrer en communication !</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Bouton de réponse d&apos;appel </translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Bouton de refus d&apos;appel </translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Répondre</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Annuler l&apos;appel sortant</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>Démarrer un appel vidéo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>Démarrer un appel audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Effacer la conversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Retirer le contact</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Bloquer le contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copier le numéro ou identifiant Ring</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contactez-moi sur Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mon identifiant Ring est : </translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Message en provenance de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Appel entrant de %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Paramètres</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Onglet Configuration générale</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Onglet de configuration audio / vidéo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Vidéo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Onglet de configuration de comptes</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Comptes</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>quitter le menu des paramètres</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Paramètres de l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Garder l&apos;historique pendant (jours)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Mettre à 0 pour une durée de l&apos;historique illimitée)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Vider l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Paramètres divers</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Laisser minimisé en fermant</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Vérifier les mises-à-jour</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (cliquer pour modifier)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Afficher le nom du texte saisi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Nombre de jours de l’historique conservés</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>Bouton de modification d&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Enregistrer les paramètres</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Enregistrer sous :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Chemin pour l&apos;enregistrement des appels</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>case à cocher toujours enregistrer les appels</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Toujours enregistrer</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Laisser minimisé à la fermeture checkbox</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>Activer les notifications</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Activer les notifications</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Lancer Ring au démarrage</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Case à cocher pour les mises à jour automatiques</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Vérifier les mises-à-jour automatiquement tous les</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Sélectionneur d&apos;intervalle de jour pour la vérification des mises à jour</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>jours</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Bouton vérifier les mises à jour actuelles</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Prévisualisation indisponible durant l&apos;appel</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Choix de caméra</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Sélecteur de périphérique vidéeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Périphérique</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Résolution</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Sélectionneur de la résolution vidéo.</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Périphérique de sortie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Sélecteur d&apos;appareil de sortie audio</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Périphérique d’entrée</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Sélecteur d&apos;entrée audio </translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Sélecteur de nouveau compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>ajouter un nouveau compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Bouton de suppression de compte </translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>bouton exporter le compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exporter</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Lancer Ring au démarrage</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nouveau compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Êtes-vous certain de vouloir effacer l&apos;historique ?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Choisir un répertoire</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Contact existant</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>entrée de texte pour la recherche d&apos;un contact existant</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Rechercher...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>Liste de contacts existants</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Bouton de creation de contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Créer un nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>entrée de texte du nom d&apos;un nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Entrer un nom ici...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>bouton de validation de la création du contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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>Invitation entrante</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="87"/>
-        <source>nameLabel</source>
-        <translation>etiquetteNom</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="103"/>
-        <source>bestIdLabel</source>
-        <translation>étiquette bestID</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="125"/>
-        <source>Accept contact request button</source>
-        <translation>Accepter le bouton de demande de contact</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accepter</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>étouffer la demande de contact</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Ignorer</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Demande de bannissement de contact </translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bloquer</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - effacement du compte</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Voulez-vous vraiment supprimer ce compte?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Cette action ne peut être défaite</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Si ce compte n&apos;a pas été exporté, ou ajouté vers un autre appareil, il sera perdu</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Bouton d&apos;annulation de la suppression du contact</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Valider le bouton de suppression du contact</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Paramètres</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Sortir</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>À Propos</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Aucun client email trouvé</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>Curseur de qualité</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>case à cocher qualité automatique</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulaire</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>identifiantContact</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>expliquer l&apos;utilité d&apos;une demande de contact</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Envoyer une invitation</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Appel en attente</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Clavardage</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Ajouter une personne à l&apos;appel</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Transférer l&apos;appel</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Couper le micro</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Enregistrer l&apos;appel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Qualité</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Joindre des appels</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Étiquette de nom</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Temps écoulé</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Raccrocher</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Désactiver la vidéo</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Partager tout l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Partager une partie de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Partager un fichier</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migration de votre compte Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Fichiers d&apos;archive Ring (*.gz);; Tous les fichiers (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Créer un compte Ring</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,27 +1230,6 @@
         <translation>Bienvenue sur</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Pour associer cet appareil à un autre compte, vous devez d&apos;abord obtenir un NIP&lt;/span&gt;Pour cela, allez dans la gestion des comptes de l&apos;appareil contenant le compte voulu et sélectionnez le compte que vous souhaitez utiliser. 
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Créer votre profil</translation>
@@ -1791,13 +1257,6 @@
         <translation>Recherche de disponibilité...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Enregistre votre nom d&apos;utilisateur Ring.
-Ceci réserve ce nom de façon définitive et uniquement pour votre usage.
-Vos amis pourront vous appeler avec ce nom plutôt que votre RingID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Assistant</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Créer le bouton du compte Ring</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Appuyez sur le bouton pour déclencher la création d&apos;un compte Ring</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Lier le compte depuis un fichier</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Sélectionner le fichier à importer</translation>
@@ -1908,6 +1386,11 @@
         <translation>Entrée de texte pour l&apos;ajout du nom complet</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>case à cocher nom d&apos;utilisateur public</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Génération de votre compte Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Logo d&apos;accueil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Créer le bouton du compte Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Appuyez sur le bouton pour déclencher la création d&apos;un compte Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Créer un compte Ring</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Bouton pour lier le compte de l&apos;appareil</translation>
@@ -2098,27 +1566,6 @@
         <translation>Comment ajouter un appareil</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Pour associer cet appareil à un autre compte, vous devez d&apos;abord obtenir un NIP&lt;/span&gt;Pour cela, allez dans la gestion des comptes de l&apos;appareil contenant le compte voulu et sélectionnez le compte que vous souhaitez utiliser. 
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Sélectionner le fichier à importer</translation>
@@ -2180,11 +1627,38 @@
         <translation>Créez votre compte</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Enregistre votre nom d&apos;utilisateur Ring.
-Ceci réserve ce nom de façon définitive et uniquement pour votre usage.
-Vos amis pourront vous appeler avec ce nom plutôt que votre RingID.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Génération de votre compte Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migration de votre compte Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Fichiers d&apos;archive Ring (*.gz);; Tous les fichiers (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

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 9bf3c83..9380f26 100644
--- a/translations/ring_client_windows_fr_CA.ts
+++ b/translations/ring_client_windows_fr_CA.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Nom d&apos;hôte</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nom d&apos;utilisateur</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP activé</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Autoriser les appels d&apos;une source inconnue</translation>
@@ -161,23 +169,12 @@
         <translation>Nom d&apos;utilisateur public</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation>Changement de mot de passe ...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Paramètres du compte Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Autoriser l&apos;appel d&apos;une case inconnue </translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Jouer</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Ajouter un appareil</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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 associer un nouvel appareil à un compte Ring, vous exportez votre compte sur le réseau Ring. Cela générera un numéro NIP que vous devrez saisir dans votre nouvel appareil dans les 10 minutes.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,13 +605,13 @@
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>Identificateur Ring</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Choisir le fichier</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Fichiers (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Veuillez attendre que votre NIP soit généré.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Erreur de réseau. Veuillez réessayer plus tard.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Mauvais mot de passe</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Enregistrement... Cela peut prendre un moment</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>Liste des contacts existants</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ou entrer le numéro</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>bouton transférer l’appel </translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transfert</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <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="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversations</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring est un logiciel libre de communication universel qui respecte la liberté et vie privée de ses utilisateurs.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Bouton partager l&apos;identificateur Ring</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="804"/>
-        <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="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Ajouter aux contacts</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>veut vous parler!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Répondre à l&apos;appel entrant</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Ignorer l&apos;appel entrant</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Réponse</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Bouton partager l&apos;identificateur Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <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="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Ajouter aux contacts</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>veut vous parler!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Répondre à l&apos;appel entrant</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Ignorer l&apos;appel entrant</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Réponse</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copier le numéro</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contactez-moi sur Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mon identifiant Ring est:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Message entrant de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Appel entrant de %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Réglages</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Général</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Vidéo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Comptes</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>Quitter le menu paramètres</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Paramètres de l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Conserver l&apos;historique pour (nombre de jours)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Effacer l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Vérifier les mises à nouveaux maintenant </translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>bouton effacer l&apos;historique</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Paramètres d&apos;enregistrement</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Enregistrer sous:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Enregistrer en tout temps</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Vérifier les mise à jour automatiquement tous les </translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>jours</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>L&apos;aperçu n&apos;est pas disponible pendant un appel</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Sélection de l&apos;appareil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Appareil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Résolution</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Périphérique de sortie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Périphérique d&apos;entrée</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>ajouter un nouveau compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>bouton supprimer le compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Bouton exprimer le compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportation</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Lancer Ring au démarrage</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nouveau compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Êtes-vous certain de vouloir effacer tout l&apos;historique?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Choisir un répertoire</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Contact existant</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Recherche</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>liste des contacts existants</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Bouton créer un nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Créer un nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Inscrire un nom ici</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Créer</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation>Bouton accepter la demande de contact</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accepter</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bloquer</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Supprimer</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Réglages</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>À propos</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Choisir le fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Fichiers (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Aucun client de courriel par défaut n&apos;a été trouvé</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Appel en attente</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Clavardage</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Ajouter une personne à l&apos;appel</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Transférer un appel</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Couper le microphone</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Qualité</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Joindre l&apos;appel</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Nom de l&apos;étiquette</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Raccrocher</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Couper le son de la vidéo</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Partager la totalité de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Partager une partie de l&apos;écran</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Partager le fichier</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Créer votre profil</translation>
@@ -1784,11 +1257,6 @@
         <translation>En cours de recherche ...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Assistant de dialogue</translation>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Bouton créer un compte Ring</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation>Lier un compte à partir d&apos;un fichier</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Sélectionner un fichier à importer</translation>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Génération de votre compte Ring ...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Bouton créer un compte Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Sélectionner un fichier à importer</translation>
@@ -2164,8 +1627,37 @@
         <translation>Créez votre compte</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Création de votre compte Ring ...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 ab6a520..08646fc 100644
--- a/translations/ring_client_windows_fr_FR.ts
+++ b/translations/ring_client_windows_fr_FR.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>nom d&apos;hôte</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>nom d&apos;utilisateur</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>autoriser les appels connu</translation>
@@ -160,23 +169,12 @@
         <translation>nom public</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>jouer</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>choisir un fichier</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transférer</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Ajouter dans les contacts</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Répondre</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Ajouter dans les contacts</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Répondre</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copier le numéro de téléphone</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Réglages</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nom</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>Ajouter un nouveau contact </translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nouveau compte</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nouveau contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accepter</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annuler</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>d&apos;accord</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuration</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>A propos </translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>choisir un fichier</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuration</translation>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Vidéo muette</translation>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_he.ts

diff --git a/translations/ring_client_windows_he.ts b/translations/ring_client_windows_he.ts
index 73e0514..e772ea1 100644
--- a/translations/ring_client_windows_he.ts
+++ b/translations/ring_client_windows_he.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>לקוח Microsoft Windows עבור Ring.
-‏Ring הינו תוכנת תקשורת מאובטחת ומבוזרת.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>שם מארח</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>שם משתמש</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP מאופשר</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -588,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>בחר קובץ</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>קבצים (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>או הקלד מספר...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>העבר</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>דיונים</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>העתק מספר</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>כלליות</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>אודיו/וידאו</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>חשבונות</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>הגדרות היסטוריה</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>טהר היסטוריה</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>פרופיל</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>שם</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>מכשיר</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>רזולוציה</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>חשבון חדש</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>האם אתה בטוח כי ברצונך לטהר את ההיסטוריה שלך?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>איש קשר קיים</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>חפש...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>צור איש קשר חדש</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>איש קשר חדש</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>הזן שם כאן...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>קבל</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>מחק</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>ביטול</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>הגדרות</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>תצורה</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>אודות</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>בחר קובץ</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>קבצים (*)</translation>
     </message>
@@ -1513,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1552,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>שיחה</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>תצורה</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>נתק</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>כבה וידאו</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>שתף אזור מסך</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>שתף קובץ</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>כעת מפיק חשבון Ring שלך...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>כעת מפיק חשבון Ring שלך...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_hi_IN.ts

diff --git a/translations/ring_client_windows_hi_IN.ts b/translations/ring_client_windows_hi_IN.ts
index 2eef5d6..c40c906 100644
--- a/translations/ring_client_windows_hi_IN.ts
+++ b/translations/ring_client_windows_hi_IN.ts
@@ -1,57 +1,59 @@
-<?xml version="1.0" ?><!DOCTYPE TS><TS language="hi_IN" version="2.0">
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS>
+<TS version="2.0" language="hi_IN">
 <context>
     <name>AboutDialog</name>
     <message>
         <location filename="../aboutdialog.ui" line="435"/>
         <location filename="../aboutdialog.ui" line="465"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="462"/>
         <source>about button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="478"/>
         <source>credits button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="481"/>
         <source>Credits</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="547"/>
         <source>Live Free or Die</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation type="unfinished"/>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
         <source>version</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="39"/>
         <source>Created by:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="73"/>
         <source>Artwork by:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="77"/>
         <source>Based on the SFLPhone project</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -59,12 +61,12 @@
     <message>
         <location filename="../accountdetails.ui" line="23"/>
         <source>Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="66"/>
         <source>General</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="143"/>
@@ -74,663 +76,615 @@
     <message>
         <location filename="../accountdetails.ui" line="206"/>
         <source>Type</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="280"/>
         <source>Hostname</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="469"/>
         <location filename="../accountdetails.ui" line="1776"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="515"/>
         <source>Proxy</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="558"/>
         <source>Voicemail number</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="598"/>
         <source>Auto-answer calls</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="619"/>
         <source>UPnP enabled</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="895"/>
         <source>Allow Call From Contact</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="880"/>
         <source>Allow Call From History</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="69"/>
         <source>General account info configuration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="169"/>
         <source>Displayed name</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="191"/>
         <source>Displayed alias input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="302"/>
         <source>Hostname URL for DHT bootstrap or SIP</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="323"/>
         <source>Public username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="389"/>
         <source>Name service URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="411"/>
         <source>Nameservice URL input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="448"/>
         <source>SIP username input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="491"/>
         <source>SIP password input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="537"/>
         <source>SIP proxy URL input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="580"/>
         <source>SIP voicemail number</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="592"/>
         <source>Autoanswer call checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="613"/>
         <source>UPnP enabled checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="632"/>
         <source>Old password input line</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="641"/>
         <source>Input old password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="656"/>
         <source>Old Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="669"/>
         <source>New password text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="675"/>
         <source>Input new password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="692"/>
         <source>New password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="705"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="711"/>
         <source>Input confirmation </source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="727"/>
         <source>New pass confirmation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="751"/>
         <source>Change password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="770"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="783"/>
         <source>Cancel password change button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="798"/>
         <source>Changing password ...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="874"/>
         <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="892"/>
         <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="931"/>
         <source>Ringtone Selection</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="955"/>
         <source>Play ringtone button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>शुरू करें</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="971"/>
         <source>ringtone file selector</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1021"/>
         <source>Audio/Video</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1024"/>
         <source>Audio/video codecs preferences configuration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1240"/>
         <source>Audio codecs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1270"/>
         <source>Video codecs</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1287"/>
         <source>Advanced</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1290"/>
         <source>Account advanced configuration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1336"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1356"/>
         <source>Registration expire timeout (seconds):</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1372"/>
         <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1397"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1418"/>
         <source>Local Port:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1436"/>
         <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1522"/>
         <source>same as local radio button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1528"/>
         <source>Same as local parameters</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1546"/>
         <source>personalise address and ports radio button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1552"/>
         <source>Set published address and port:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1578"/>
         <source>Address</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1597"/>
         <source>ip address text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1612"/>
         <source>Port</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1631"/>
         <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1666"/>
         <source>use STUN checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1672"/>
         <source>Use STUN</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1688"/>
         <location filename="../accountdetails.ui" line="1735"/>
         <source>Server URL</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1710"/>
         <source>use TURN checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1716"/>
         <source>Use TURN</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1732"/>
         <source>TURN server URL input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1751"/>
         <source>TURN server username input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1770"/>
         <source>TURN server password input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1792"/>
         <source>TURN server Realm input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1795"/>
         <source>Realm</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1844"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1872"/>
         <source>These settings are only used during SDP session negotiation in case ICE is not supported by the server or peer.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1914"/>
         <source>Audio RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1944"/>
         <location filename="../accountdetails.ui" line="2084"/>
         <source>Min</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1960"/>
         <location filename="../accountdetails.ui" line="2100"/>
         <source>Lower boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1978"/>
         <location filename="../accountdetails.ui" line="2118"/>
         <source>Max</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1994"/>
         <location filename="../accountdetails.ui" line="2134"/>
         <source>higher boundary for audio RTP port range selector</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2054"/>
         <source>Video RTP Port Range</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2186"/>
         <source>Security</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2189"/>
         <source>Account security configuration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2276"/>
         <source>Certificate authaurity certificate selector</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2313"/>
         <source>User certificate selector</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2371"/>
         <source>private key password input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2393"/>
         <source>User private key selector</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2417"/>
         <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2420"/>
         <source>Media Stream Encryption (SRTP)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2432"/>
         <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2488"/>
         <source>Devices</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2491"/>
         <source>Account devices management</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2535"/>
         <source>Add device button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2538"/>
         <source>Add device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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"/>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2584"/>
         <source>Password (required)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2612"/>
         <source>Cancel account export for linking button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="786"/>
         <location filename="../accountdetails.ui" line="2615"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2709"/>
         <source>Generated PIN for linking</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2712"/>
         <source>PIN</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2722"/>
         <source>This pin should be entered on your new device within 5 minutes. You may generate a new one at any moment.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2741"/>
         <source>Accept PIN generation and quit button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2744"/>
         <source>OK</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2769"/>
         <source>Banned Contacts</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2772"/>
         <source>Account banned contacts management tab</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1495"/>
         <source>Published Address</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2254"/>
         <source>CA certificate</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2294"/>
         <source>User certificate</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2331"/>
         <source>Private key</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2346"/>
         <source>Private key password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2435"/>
         <source>Use default ciphers</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -738,7 +692,7 @@
     <message>
         <location filename="../animatedoverlay.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -746,662 +700,249 @@
     <message>
         <location filename="../bannedcontactswidget.ui" line="20"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="41"/>
         <source>Banned contacts list</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="69"/>
         <source>Banned ID</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="101"/>
         <source>Deban contact button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="104"/>
         <source>Deban contact, and add to contact list</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
-        <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>नाम</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
+        <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"/>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation type="unfinished"/>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation type="unfinished"/>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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"/>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation type="unfinished"/>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1409,40 +950,40 @@
     <message>
         <location filename="../invitebuttonswidget.ui" line="72"/>
         <source>Accept invite</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../invitebuttonswidget.ui" line="104"/>
         <source>Ignore invite</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../invitebuttonswidget.ui" line="136"/>
         <source>Block person</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>रिंग</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1450,7 +991,7 @@
     <message>
         <location filename="../photoboothdialog.ui" line="14"/>
         <source>Photobooth</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1458,88 +999,85 @@
     <message>
         <location filename="../photoboothwidget.ui" line="14"/>
         <source>Form</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.ui" line="20"/>
         <source>Photobooth display</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.ui" line="51"/>
         <source>Take photo</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.ui" line="71"/>
         <source>or</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.ui" line="84"/>
         <source>Import photo</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.ui" line="87"/>
         <source>Import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.cpp" line="60"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../photoboothwidget.cpp" line="62"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation type="unfinished"/>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1547,126 +1085,83 @@
     <message>
         <location filename="../ringbutton.ui" line="140"/>
         <source>Select folder</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <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"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="89"/>
         <source>Hold / Unhold</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="124"/>
         <source>Chat</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../videooverlay.ui" line="57"/>
         <source>Hangup</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1674,330 +1169,330 @@
     <message>
         <location filename="../wizarddialog.cpp" line="71"/>
         <source>Your account needs to be migrated. Enter your password.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation type="unfinished"/>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
         <source>Importing account archive...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="174"/>
         <source>Add a device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="292"/>
         <source>Username not available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="295"/>
         <source>Username is available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="298"/>
         <source>Username is invalid.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="301"/>
         <source>Network error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="349"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="322"/>
         <source>How to add a device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="78"/>
         <source> Welcome to</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="450"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="564"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="629"/>
+        <location filename="../wizarddialog.cpp" line="178"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="730"/>
+        <source>Choose your username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="749"/>
+        <location filename="../wizarddialog.cpp" line="264"/>
+        <source>Searching...</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="33"/>
+        <source>Wizard Dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="36"/>
+        <source>Account creation wizard dialog</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="72"/>
+        <source>Welcome Label</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="107"/>
+        <source>Welcome Logo</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="164"/>
+        <source>Link device button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="170"/>
+        <source>Push button for device linkage start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="205"/>
+        <source>Select link method</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="254"/>
+        <source>Link account to device from the network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="257"/>
+        <source>Link account from DHT</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="270"/>
+        <source>Link from exported account archive file</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="273"/>
+        <source>Link account from file</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="329"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="629"/>
-        <location filename="../wizarddialog.cpp" line="178"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="730"/>
-        <source>Choose your username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="749"/>
-        <location filename="../wizarddialog.cpp" line="264"/>
-        <source>Searching...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="33"/>
-        <source>Wizard Dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="36"/>
-        <source>Account creation wizard dialog</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="72"/>
-        <source>Welcome Label</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="107"/>
-        <source>Welcome Logo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="164"/>
-        <source>Link device button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="170"/>
-        <source>Push button for device linkage start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="205"/>
-        <source>Select link method</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="254"/>
-        <source>Link account to device from the network</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="257"/>
-        <source>Link account from DHT</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="270"/>
-        <source>Link from exported account archive file</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="273"/>
-        <source>Link account from file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="382"/>
         <source>Account archive path:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="389"/>
         <source>Account archive path selector</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="406"/>
         <source>Archive password:</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="413"/>
         <source>Archive passord input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="482"/>
         <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="509"/>
         <source>Avatar display</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="588"/>
         <source>Full name edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="594"/>
         <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="676"/>
         <source>Checkbox selecting if the user wants a public username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="679"/>
         <source>Register public username (experimental)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="724"/>
         <source>Public username edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="746"/>
         <source>Public username validation status</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="778"/>
         <source>PIN edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="784"/>
         <source>Device linking PIN text entry</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="787"/>
         <source>Enter your pin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="814"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="820"/>
         <source>Password text entry</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="826"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="853"/>
         <location filename="../wizarddialog.ui" line="859"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="865"/>
         <source>Confirm password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation type="unfinished"/>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
         <source>Previous page button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="975"/>
         <source>push button to access previous page of wizard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="978"/>
         <source>Previous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="1010"/>
         <source>Next page Button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="1016"/>
         <source>Push button to access next page of wizard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="1019"/>
         <source>Next</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -2005,330 +1500,330 @@
     <message>
         <location filename="../wizardwidget.ui" line="33"/>
         <source>Wizard Dialog</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="36"/>
         <source>Account creation wizard dialog</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="72"/>
         <source>Welcome Label</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="78"/>
         <source> Welcome to</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="107"/>
         <source>Welcome Logo</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="170"/>
         <source>Push button for device linkage start trigger</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="173"/>
         <source>Link this device to an account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="205"/>
         <source>Select link method</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="254"/>
         <source>Link account to device from the network</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="257"/>
         <source>Link account from DHT</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="270"/>
         <source>Link from exported account archive file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="273"/>
         <source>Link account from file</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="322"/>
         <source>How to add a device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="357"/>
+        <source>Select file to import</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="382"/>
+        <source>Account archive path:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="389"/>
+        <source>Account archive path selector</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="406"/>
+        <source>Archive password:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="413"/>
+        <source>Archive passord input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="450"/>
+        <source>Create your profile</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="482"/>
+        <source>Photobooth Widget</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="509"/>
+        <source>Avatar display</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="564"/>
+        <source>Enter your full name:</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="588"/>
+        <source>Full name edit</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="594"/>
+        <source>Text entry for full name input</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="629"/>
+        <location filename="../wizardwidget.cpp" line="167"/>
+        <source>Create your account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="329"/>
         <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
 &lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
 p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:&apos;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
 &lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="357"/>
-        <source>Select file to import</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="382"/>
-        <source>Account archive path:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="389"/>
-        <source>Account archive path selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="406"/>
-        <source>Archive password:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="413"/>
-        <source>Archive passord input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="450"/>
-        <source>Create your profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="482"/>
-        <source>Photobooth Widget</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="509"/>
-        <source>Avatar display</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="564"/>
-        <source>Enter your full name:</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="588"/>
-        <source>Full name edit</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="594"/>
-        <source>Text entry for full name input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="629"/>
-        <location filename="../wizardwidget.cpp" line="167"/>
-        <source>Create your account</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
         <source>Public username checkbox</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="676"/>
         <source>Checkbox selecting if the user wants a public username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="679"/>
         <source>Register public username (experimental)</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="724"/>
         <source>Public username edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="730"/>
         <source>Choose your username</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="746"/>
         <source>Public username validation status</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="749"/>
         <location filename="../wizardwidget.cpp" line="253"/>
         <source>Searching...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="778"/>
         <source>PIN edit</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="784"/>
         <source>Device linking PIN text entry</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="787"/>
         <source>Enter your pin</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="814"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="820"/>
         <source>Password text entry</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="826"/>
         <source>Password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="853"/>
         <location filename="../wizardwidget.ui" line="859"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="865"/>
         <source>Confirm password</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation type="unfinished"/>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
         <source>Previous page button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="975"/>
         <source>push button to access previous page of wizard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="978"/>
         <source>Previous</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="1010"/>
         <source>Next page Button</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="1016"/>
         <source>Push button to access next page of wizard</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="1019"/>
         <source>Next</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="71"/>
         <source>Your account needs to be migrated. Enter your password.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation type="unfinished"/>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
         <source>Importing account archive...</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="163"/>
         <source>Add a device</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="281"/>
         <source>Username not available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="284"/>
         <source>Username is available.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="287"/>
         <source>Username is invalid.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="290"/>
         <source>Network error.</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="337"/>
         <source>Open File</source>
-        <translation type="unfinished"/>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"></translation>
     </message>
 </context>
-</TS>
\ No newline at end of file
+</TS>

translations/ring_client_windows_hr.ts

diff --git a/translations/ring_client_windows_hr.ts b/translations/ring_client_windows_hr.ts
index 1812b7e..080c39f 100644
--- a/translations/ring_client_windows_hr.ts
+++ b/translations/ring_client_windows_hr.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>Ime poslužitelja</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Korisničko ime</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP omogućen</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Postavke Ring računa</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>izvodi</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pauza</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Izaberite datoteku</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Datoteke (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ili utipkajte broj...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Prenesi</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Razgovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Greška prilikom generiranja QR koda</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Dodaj u kontakte</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Želi govoriti sa vama!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Javi se</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Greška prilikom generiranja QR koda</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Dodaj u kontakte</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Želi govoriti sa vama!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Javi se</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopiraj broj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Dolazni poziv od %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Postavke</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Opće</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Računi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Postavke povijesti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Zadrži povijest (dana)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Postavi na 0 za neograničenu povijest)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Očisti povijest</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Ime</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Postavke snimanja</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Spremi u:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Uvijek snimaj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Provjeri za ažuriranja svakih</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dana</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Odabir uređaja</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Uređaj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Razlučivost</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Izlazni uređaj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Ulazni uređaj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>dodaj novi kontakt</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Izvezi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Pokreni Ring pri paljenju računala</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Novi račun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Jeste li sigurni da želite očistiti svu vašu povijest?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Izaberite direktorij</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Postojeći kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Traži...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Napravi novi kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Novi kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Unesite ime ovdje...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Stvori</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Prihvati</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokiraj</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Izbriši</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Poništi</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>U redu</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Postavke</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfiguracija</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Izađi</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>O programu</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Izaberite datoteku</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation>Čavrljanje</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Isključi mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kvalitet</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfiguracija</translation>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Ugasi video</translation>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Dijelite područje zaslona</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Dijeli datoteku</translation>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Napravite vaš profil</translation>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation>Napravite vaš račun</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_hu.ts

diff --git a/translations/ring_client_windows_hu.ts b/translations/ring_client_windows_hu.ts
index ff78fcd..aea4445 100644
--- a/translations/ring_client_windows_hu.ts
+++ b/translations/ring_client_windows_hu.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>A Microsoft Windows ügyfél a Jamihoz.
-A Jami egy biztonságos és osztott közlés szoftver</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Kiszolgálónév</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Felhasználónév</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP engedélyezve</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Hívások engedélyezése ismeretlenektől</translation>
@@ -161,23 +169,12 @@
         <translation>Nyilvános felhasználónév</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Jami nyilvánosan regisztrált felhasználónév</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Felhasználónév regisztrálása blokkláncon gomb</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Regisztráljon a blokkláncon</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Jelszó megváltoztatása…</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Fiók beállítások</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Hívás engedélyezése az ismeretlen jelölőnégyzetből</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Lejátszás</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Eszköz hozzáadása</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Ahhoz hogy új eszközt adjon a Jami fiókjához, exportálnia kell a fiókját a Jami-n. Ez előállít egy PIN-t, amit meg kell adnia az új eszközén, az előállítástól számított 5 percen belül.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Mé_gse</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Ellenőrizze a kivitelt a DHT-n készülék összekapcsolása gomb</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exportálás a Jami-n</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>A generált PIN:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Alapértelmezett cipherek használata</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Megállítás</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>Jami azonosító</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Fájl kiválasztása</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Fájlok (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Kérem várjon, amíg létrehozzuk az Ön PIN-kódját.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Hálózati hiba. Kérjük, hogy próbálja újra később.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Hibás jelszó.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Regisztráció… Ez eltarthat egy ideig</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>Meglévő kapcsolatok listája</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>kapcsolati átviteli szám szövegbevitel</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>vagy írjon be egy számot…</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Hívásátirányítás gomb</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Átvitel</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Partnerek keresése vagy Jami azonosító beírása</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>Beszélgetések megjelenítése</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Beszélgetések</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>A Jami szabad szoftver az egyetemes közléshez, amely tiszteletben tartja a felhasználók szabadságát és magánszféráját.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Keresés kapcsolati szövegbevitel</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Jami azonosító QR-kód mutatása</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Ring azonosító megosztó gomb</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Kattintson duplán a másolásra</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <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="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>Jami a szabad szoftver az egyetemes közléshez, amely tiszteletben tartja a felhasználók szabadságát és magánéletét.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Vissza a főoldalra gomb</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Hozzáadás a partnerekhez</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>Meghívás megjelenítése</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>Meghívás</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Beszélni akar önnel!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Bejövő hívás fogadása gomb</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Bejövő hívás figyelmen kívül hagyása gomb</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Válaszol</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Jami azonosító QR-kód mutatása</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Ring azonosító megosztó gomb</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Kattintson duplán a másolásra</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <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="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation>legjobb név</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation>legjobb azonosító</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Vissza a főoldalra gomb</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Hozzáadás a partnerekhez</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>Meghívás megjelenítése</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>Meghívás</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Beszélni akar önnel!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Bejövő hívás fogadása gomb</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Bejövő hívás figyelmen kívül hagyása gomb</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Válaszol</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Figyelmen kívül hagy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Kimenő hívás visszavonása</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Mégse</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>Videóhívás indítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>Hanghívás indítása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Beszélgetés törlése</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Partner eltávolítása</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Blokkolt partner</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Szám másolása</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Az elérhetőségem a Jami-n</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>A Jami azonosítóm:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Bejövő üzenet a következőtől: %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Bejövő hívás tőle: %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Beállítások</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Általános beállítások lap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Általános</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Audió és videó beállítások lap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Hang/videó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Fiókok beállítások lap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Fiókok</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>kilépés a beállítások menüből</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Előzmények beállításai</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Előzmények megtartása ennyi napig</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Állítsa 0-ra a végtelen előzményekért)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Előzmények törlése</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Egyéb beállítások</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Bezáráskor legyen minimalizálva</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Frissítések ellenőrzése most</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (kattintson a változtatáshoz)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Megjelenítési név szövegbevitel</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Név</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Napok száma az előzmények tartásához</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>Előzmények törlése gomb</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Felvételbeállítások</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Mentési hely:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Hívásnapló útvonal</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>Mindig hívás rögzítés jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Mindig legyen felvétel</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>bezáráskor legyen minimalizálva jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>értesítések engedélyezése jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Értesítések engedélyezése</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Jami indítása rendszerindításkor jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Automatikus frissítés ellenőrző jelölőnégyzet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Frissítések ellenőrzése minden</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Időközönkénti frissítések ellenőrzése napi választó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>nap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Frissítések ellenőrzése most gomb</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Előnézet nem elérhető hívás közben</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Eszköz kiválasztása</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Videó eszköz választó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Eszköz</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Felbontás</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Videó eszköz felbontás választó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Kimeneti eszköz</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Audió kimeneti eszköz választó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Bemeneti eszköz</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Audió bemeneti eszköz választó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Új fiók típus választó</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>új fiók hozzáadása</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Fiók törlése gomb</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Fiók exportálása gomb</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportálás</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>A Jami indítása rendszerindításkor</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Új fiók</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Biztos, hogy törölni akarja az összes előzményt?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Könyvtár kiválasztása</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Létező partner</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>keresés meglévő kapcsolat szövegbeviteli</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Keresés…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>Meglévő kapcsolatok listája</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Új partner létrehozása gomb</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Új partner létrehozása</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Új partner</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Új kapcsolat neve szövegbevitel</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Név beírása ide…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>kapcsolat létrehozásának ellenőrzése  gomb</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Létrehozás</translation>
-    </message>
-</context>
-<context>
-    <name>ContactRequestWidget</name>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Feladó</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="28"/>
-        <source>Incoming Contact Request</source>
-        <translation>Bejövő kapcsolatfelvételi kérelem</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="87"/>
-        <source>nameLabel</source>
-        <translation>név Címke</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="103"/>
-        <source>bestIdLabel</source>
-        <translation>Legjobb azonosító címke</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="125"/>
-        <source>Accept contact request button</source>
-        <translation>Kapcsolatfelvételi kérelem elfogadása gomb</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Elfogadás</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Elrejtett kapcsolatfelvételi kérelem</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Elveti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Letiltott kapcsolatfelvételi kérelem</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokkolás</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Jami fiók törlése</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Tényleg szeretné törölni a fiókot?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Ez a művelet visszavonhatatlan</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Ha ezt a fiókot nem exportálták vagy hozzáadták egy másik eszközhöz, akkor ez el fog veszni</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Mégsem kapcsolat törlése gomb</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Törlés</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Mé_gse</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Kapcsolat törlésének ellenőrzése gomb</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Jami</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation>Beállítások</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Kilépés</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Névjegy</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Fájl kiválasztása</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Fájlok (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Nem találtam alapértelmezett levelezőügyfélt</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation>Jami fiók</translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation>Minőség csúszka</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Automatikus minőségellenőrizés jelölőnégyzet </translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automatikus</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Feladó</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>Kapcsolatazonosító</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>CSINÁLNI: Magyarázza meg a kapcsolatfelvételi kérelmét célját</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Kapcsolatkérés küldése</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Hívástartás</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Csevegés</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Személy hozzáadása a hiváshoz</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Hívásátirányítás</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Mikrofon elnémítása</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Hívás felvétele</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Minőség</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Hívások csatlakozása</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Névcímke</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Eltelt idő</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Beállítások</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Lerak</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Videó némítása</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Az egész képernyő megosztása</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Képernyő részének megosztása</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Fájl megosztása</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Jami fiók átvitele…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Jami archív fájlok (* .gz) ;; Minden fájl (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Jami fiók létrehozása</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Isten hozott</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Először az eszköz összekapcsolása egy másik fiókkal &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt; meg kell szereznie a PIN-kódot &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;A PIN kód létrehozása:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Menjen a&lt;span style=&quot; font-weight:600;&quot;&gt;Fiókkezelés beállítása &lt;/span&gt;egy korábbi eszközről &lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Válassza a &lt;span style=&quot; font-weight:600;&quot;&gt;Jami fiók &lt;/span&gt;szeretné használni&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Menjen a&lt;span style=&quot; font-weight:600;&quot;&gt;Eszközök&lt;/span&gt;lap&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Válassza&lt;span style=&quot; font-weight:600;&quot;&gt;Eszköz hozzáadása&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Kapja meg a szükséges PIN-kódot az űrlap kitöltéséhez. A PIN -kód csak érvényes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 percig&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Saját profil létrehozása</translation>
@@ -1793,11 +1257,6 @@
         <translation>Keresés… </translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <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>Regisztrálja felhasználónevét a Jami-n. Ez fenntartja a felhasználónevet, hogy csak Ön tudja használni. Ismerősei képesek lesznek felhívni a felhasználónevét a Jami azonosító használata helyett.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Varázsló párbeszédpanel</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Jami fiók létrehozása gomb</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Nyomógomb a Jami fiók létrehozás indításának aktivizálásához </translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Fiók összekapcsolása fájlból</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Válassza ki az importálni kívánt fájlt</translation>
@@ -1908,6 +1386,11 @@
         <translation>Szövegbevitel a teljes névbevitelhez</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>Nyilvános felhasználónév jelölőnégyzet</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>A Jami fiókja létrehozása…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Üdvözlő jelkép</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Jami fiók létrehozása gomb</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Nyomógomb a Jami fiók létrehozás indításának aktivizálásához </translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Jami fiók létrehozása</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Összekapcsoló eszköz gombja</translation>
@@ -2098,29 +1566,6 @@
         <translation>Hogyan adjunk egy eszközt hozzá</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Először az eszköz összekapcsolása egy másik fiókkal &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt; meg kell szereznie a PIN-kódot &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;A PIN kód létrehozása:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Menjen a&lt;span style=&quot; font-weight:600;&quot;&gt;Fiókkezelés beállítása &lt;/span&gt;egy korábbi eszközről &lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Válassza a &lt;span style=&quot; font-weight:600;&quot;&gt;Jami fiók &lt;/span&gt;szeretné használni&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Menjen a&lt;span style=&quot; font-weight:600;&quot;&gt;Eszközök&lt;/span&gt;lap&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Válassza&lt;span style=&quot; font-weight:600;&quot;&gt;Eszköz hozzáadása&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Kapja meg a szükséges PIN-kódot az űrlap kitöltéséhez. A PIN -kód csak érvényes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 percig&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Válassza ki az importálni kívánt fájlt</translation>
@@ -2182,9 +1627,38 @@
         <translation>Fiók létrehozása</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>Regisztrálja felhasználónevét a Jami-n. Ez fenntartja a felhasználónevet, hogy csak Ön tudja használni. Ismerősei képesek lesznek felhívni a felhasználónevét a Jami azonosító használata helyett.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>A Jami fiókja létrehozása…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Jami fiók átvitele…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Jami archív fájlok (* .gz) ;; Minden fájl (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_id.ts

diff --git a/translations/ring_client_windows_id.ts b/translations/ring_client_windows_id.ts
index de428eb..b0ac9ac 100644
--- a/translations/ring_client_windows_id.ts
+++ b/translations/ring_client_windows_id.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
@@ -120,6 +124,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation type="unfinished"/>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Tambah sebagai kontak</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Tambah sebagai kontak</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Salin nomor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nama</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Terima</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokir</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_it.ts

diff --git a/translations/ring_client_windows_it.ts b/translations/ring_client_windows_it.ts
index 828fc23..375b0e3 100644
--- a/translations/ring_client_windows_it.ts
+++ b/translations/ring_client_windows_it.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>Nome Host</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nome utente</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP attivato</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Play</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Usare il cifrario di default</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,638 +722,225 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Trasferimento</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Converzazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring è un software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Aggiungi contatti</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Aggiungi contatti</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copia il numerp</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Impostazioni</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Accounts</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Impostazioni storico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profilo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Esportare</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nuovo account</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nuovo contatto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Crea</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accettare</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blocca</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
-        <source>Cancel</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation>Cancella</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
+        <source>Cancel</source>
+        <translation>Cancella</translation>
     </message>
 </context>
 <context>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Suona</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configurazione</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
@@ -1646,7 +1139,7 @@
         <translation>Riattacare</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Condividere una porzione dello schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Condividere file</translation>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generazione del account Ring in corso…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generazione del account Ring in corso…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 05db7cb..7849a83 100644
--- a/translations/ring_client_windows_it_IT.ts
+++ b/translations/ring_client_windows_it_IT.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Client Ring per Microsoft Windows.
-Ring è un software per comunicazioni sicure e distribuite.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Hostname</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Utente</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP abilitato</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Permetti chiamate da sconosciuti</translation>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Opzioni dell&apos;account Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Avvia</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Aggiungi dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Esporta su Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Usa il cifrario di default</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pausa</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Scegli un file</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Files (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Password errata.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>O scrivi un numero...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Trasferisci</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Cerca un contatto o inserisci il suo Ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversazioni</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Errore durante la generazione del Codice QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Aggiungi alla rubrica</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Vuole parlare con te!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Rispondi</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Errore durante la generazione del Codice QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Aggiungi alla rubrica</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Vuole parlare con te!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Rispondi</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignora</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copia numero</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contattami su RIng</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Il mio Ring ID è:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Messaggio in arrivo da %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Chiamata in arrivo da %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Opzioni</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Generale</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Accounts</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>Esci dalle impostazioni</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Impostazioni Cronologia</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Mantieni la cronologia per (Giorni)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(0 per cronologia illimitata)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Cancella cronologia</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Impostazioni Varie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Minimizza alla chiusura</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profilo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Controlla aggiornamenti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Salva in:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Registra Sempre</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Cerca aggiornamenti ogni</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>giorni</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Anteprima non disponibile durante la chiamata</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Seleziona Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Risoluzione</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Dispositivo di Uscita</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Dispositivo di Ingresso</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>aggiungi un nuovo account</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Esporta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Esegui Ring all&apos;avvio</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nuovo Account</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Sei sicuro di voler cancellare tutta la cronologia?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Scegli Cartella</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Contatto Esistente</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Cerca...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Crea un nuovo contatto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nuovo Contatto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Inserisci un nome qui...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Crea</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Accetta</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blocca</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Elimina</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annulla</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Squilla</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Opzioni</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configurazione</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Info</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Scegli un file</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Files (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Nessun client E-Mail di Default</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Modulo</translation>
-    </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Chiamata in attesa...</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Aggiungi alla chiamata</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Trasferisci chiamata</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Mutati</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Qualità</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Entra in chiamata</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Etichetta Nome</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tempo trascorso</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configurazione</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Aggancia</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Muta Video</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Condividi l&apos;intero schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Condividi l&apos;area dello schermo</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Condividi file</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Crea il tuo profilo</translation>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generazione del tuo account Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation>Crea il tuo account</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generazione del tuo account Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_ja.ts

diff --git a/translations/ring_client_windows_ja.ts b/translations/ring_client_windows_ja.ts
index 06c69c6..3b58034 100644
--- a/translations/ring_client_windows_ja.ts
+++ b/translations/ring_client_windows_ja.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>ホスト名</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>ユーザー名</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP 有効</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>再生</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>パスワードが間違っています。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>転送</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>会話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>連絡先に追加</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>応答</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>連絡先に追加</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>応答</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>無視</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>番号をコピー</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>全般</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>音声/動画</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>アカウント</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>履歴の設定</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>履歴を消去</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>プロフィール</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>名前</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>日</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>端末</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>エクスポート</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>新規アカウント</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>受け入れ</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>ブロック</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>削除</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>キャンセル</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation>チャット</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>設定</translation>
     </message>
@@ -1646,7 +1139,7 @@
         <translation>受話</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>動画オフ</translation>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>画面を共有</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>ファイルを共有</translation>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>プロフィールを作成</translation>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_ko_KR.ts

diff --git a/translations/ring_client_windows_ko_KR.ts b/translations/ring_client_windows_ko_KR.ts
index 976b018..17b4571 100644
--- a/translations/ring_client_windows_ko_KR.ts
+++ b/translations/ring_client_windows_ko_KR.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>마이크로소프트 윈도우즈용 Ring 클라이언트.
-Ring은 보안 기능을 가진 분산 커뮤니케이션 소프트웨어입니다.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>호스트명</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>사용자명</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP 가능여부</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>모르는 사람과 통화 허용</translation>
@@ -161,23 +169,12 @@
         <translation>공개 사용자명</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>블록체인에 등록</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring 계정 설정</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>재생</translation>
     </message>
@@ -588,8 +579,8 @@
         <translation>장치 추가하기</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>기본 ciphers 사용하기</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>멈춤</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>파일 선택</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>파일들 (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>PIN을 생성하는 동안 잠시만 기다려주세요.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>네트워크 오류입니다. 잠시 후 다시 시도하세요.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>잘못된 암호입니다.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>등록중... 잠시만 기다려주세요.</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>혹은 번호를 입력하세요...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>보내기</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>연락처나 ring ID를 입력하여 찾기</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>대화</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>더블클릭으로 복사하기</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>QR 생성 중 오류</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>연락처에 추가하기</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>당신과 이야기하고 싶어합니다!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>응답</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>더블클릭으로 복사하기</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>QR 생성 중 오류</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>연락처에 추가하기</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>당신과 이야기하고 싶어합니다!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>응답</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>무시</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>나의 RingId 는 :</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>%1로부터 메시지</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>일반</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>오디오/비디오</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>이력 설정</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>이력 삭제</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>기타 설정</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>닫을 때 최소화 유지하기</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>지금 업데이트 확인하기</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>프로필</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>이름</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>녹화 설정</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>항상 녹화하기</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>알람 사용하기</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>매번 자동 업데이트 확인</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>일</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>장치 선택</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>장치</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>해상도</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>출력 장치</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>입력 장치</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>새 계정 추가하기</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>내보내기</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>시작 시 Ring 실행</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>새 계정</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>디렉토리 선택</translation>
-    </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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>찾기...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>새 연락처 추가</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>새 연락처</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>여기에 이름을 입력하세요...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>수락</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - 계정 삭제</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>정말로 계정을 삭제하시겠습니까?</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>이 작업은 되돌이킬 수 없습니다</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>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>취소</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>확인</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation type="unfinished"/>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>설정</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>종료</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>파일 선택하기</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>파일들 (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>기본 메일 클라이언트를 찾을 수 없습니다.</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>자동</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>할 일: 연락처 요청 이유 설명하기</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>연락처 추가 요청 보내기</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>대화하기</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>사용자 추가</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>마이크 끄기</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>품질</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>통화에 참여하기</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>경과한 시간</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>통화종료</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>비디오 숨기기</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>전체화면 공유하기</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>화면 영역 공유하기</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>파일 공유하기</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>당신의 Ring 계정을 이전 중입니다.</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring 계정 생성</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>이 장치를 계정에 연결하기</translation>
@@ -1743,20 +1230,6 @@
         <translation>환영합니다</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>프로필 만들기</translation>
@@ -1784,11 +1257,6 @@
         <translation>검색 중...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Ring에서 사용할 사용자명을 등록하세요. 이는 당신만 사용할 수 있는 사용자 명입니다. 당신의 친구가 RingID를 사용하는 것 대신 사용자 이름으로 연결할 수 있습니다.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ring 계정 생성 중...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring 계정 생성</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation>장치를 추가하는 법</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,9 +1627,38 @@
         <translation>계정 생성하기</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Ring에서 사용할 사용자명을 등록하세요. 이는 당신만 사용할 수 있는 사용자 명입니다. 당신의 친구가 RingID를 사용하는 것 대신 사용자 이름으로 연결할 수 있습니다.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ring 계정 생성 중...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>당신의 Ring 계정을 이전 중입니다.</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_lt.ts

diff --git a/translations/ring_client_windows_lt.ts b/translations/ring_client_windows_lt.ts
index 4288331..873295e 100644
--- a/translations/ring_client_windows_lt.ts
+++ b/translations/ring_client_windows_lt.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Microsoft Windows kliento programa, skirta Ring.
-Ring yra saugi ir paskirstytoji susisiekimo programinė įranga.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Kompiuterio vardas</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Naudotojo vardas</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP įjungta</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Leisti skambučius nuo nepažįstamųjų</translation>
@@ -161,23 +169,12 @@
         <translation>Viešasis naudotojo vardas</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registruoti blokų grandinėje</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Keičiamas slaptažodis ...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring paskyros nustatymai</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Groti</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Pridėti įrenginį</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Eksportuoti Ring sistemoje</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Naudoti numatytuosius šifrus</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pristabdyti</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Pasirinkti failą</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Failai (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Prašome palaukti, kol yra kuriamas jūsų PIN.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <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="331"/>
-        <source>Wrong password.</source>
-        <translation>Neteisingas slaptažodis.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registruojama... Tai gali šiek tiek užtrukti</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>arba įrašykite numerį...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <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="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Pokalbiai</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>Spustelėkite du kartus, norėdami nukopijuoti</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Klaida, kuriant QR kodą</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Pridėti prie kontaktų</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Nori su jumis pakalbėti!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Atsiliepti</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Spustelėkite du kartus, norėdami nukopijuoti</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Klaida, kuriant QR kodą</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Pridėti prie kontaktų</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Nori su jumis pakalbėti!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Atsiliepti</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Nepaisyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Šalinti kontaktą</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopijuoti numerį</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Susisiekite su manimi per Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mano RingId yra : </translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Gauta žinutė nuo %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Gaunamasis skambutis nuo %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Nustatymai</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Bendra</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Garsas/Vaizdas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Paskyros</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>išeiti iš nustatymų meniu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Istorijos nustatymai</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Laikyti istoriją (dienų)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Nustatykite 0 neribotai istorijai)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Išvalyti istoriją</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Įvairūs nustatymai</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Užvėrus, palikti suskleistą</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Tikrinti dabar ar yra atnaujinimų</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profilis</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Vardas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Įrašymo nustatymai</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Įrašyti į :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Visada įrašinėti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Įjungti pranešimus</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Tikrinti ar yra atnaujinimų kas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dienas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Skambučio metu, peržiūra neprieinama</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Įrenginio pasirinkimas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Įrenginys</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Raiška</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Išvesties įrenginys</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Įvesties įrenginys</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>pridėti naują paskyrą</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Eksportuoti</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Paleisti Ring, įjungus kompiuterį</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nauja paskyra</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Ar tikrai norite išvalyti visą savo istoriją?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Pasirinkti katalogą</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Esami Kontaktai</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Paieška...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Sukurti naują kontaktą</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Naujas Kontaktas</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Čia įrašykite vardą...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Kurti</translation>
-    </message>
-</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>Gaunamoji kontakto užklausa</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Priimti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Atmesti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Užblokuoti</translation>
-    </message>
-</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 really 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 contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Ištrinti</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Atsisakyti</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Gerai</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Nustatymai</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfigūracija</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Išeiti</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Apie</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Pasirinkti failą</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Failai (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Numatytoji pašto kliento programa nerasta</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automatinė</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Forma</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>Kontakto ID</translation>
-    </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>Siųsti kontakto užklausą</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Pokalbis</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Pridėti asmenį į pokalbį</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Išjungti mikrofoną</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kokybė</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Vardo etiketė</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Praėjęs laikas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfigūracija</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Padėti ragelį</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Išjungti vaizdą</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Bendrinti visą ekraną</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Bendrinti ekrano sritį</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Bendrinti failą</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Perkeliama jūsų Ring paskyra...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Sukurti Ring paskyrą</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Susieti šį įrenginį su paskyra</translation>
@@ -1743,29 +1230,6 @@
         <translation> Sveiki atvykę į</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Norėdami susieti šį įrenginį su kita paskyra, iš pradžių, &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;turite gauti PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; kodą. Norėdami sukurti PIN kodą:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pereikite į ankstesnio įrenginio &lt;span style=&quot; font-weight:600;&quot;&gt;Paskyros tvarkymo nustatymą&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pasirinkite norimą naudoti &lt;span style=&quot; font-weight:600;&quot;&gt;Ring paskyrą&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pereikite į &lt;span style=&quot; font-weight:600;&quot;&gt;Įrenginių&lt;/span&gt; kortelę&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pasirinkite &lt;span style=&quot; font-weight:600;&quot;&gt;Pridėti įrenginį&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Jūs gausite šiai formai užpildyti reikalingą PIN kodą. PIN kodas galios tik &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minučių&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Susikurkite savo profilį</translation>
@@ -1793,11 +1257,6 @@
         <translation>Ieškoma...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Užregistruokite savo naudotojo vardą Ring sistemoje. Tai rezervuos naudotojo vardą ir tokiu būdu tik jūs galėsite jį naudoti. Jūsų draugai galės jums skambinti, vietoj jūsų RingID, naudodami jūsų naudotojo vardą.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Vediklio dialogas</translation>
@@ -1819,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1863,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1908,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Kuriama jūsų Ring paskyra...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Sukurti Ring paskyrą</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2098,29 +1566,6 @@
         <translation>Kaip pridėti įrenginį</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Norėdami susieti šį įrenginį su kita paskyra, iš pradžių, &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;turite gauti PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; kodą. Norėdami sukurti PIN kodą:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pereikite į ankstesnio įrenginio &lt;span style=&quot; font-weight:600;&quot;&gt;Paskyros tvarkymo nustatymą&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pasirinkite norimą naudoti &lt;span style=&quot; font-weight:600;&quot;&gt;Ring paskyrą&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pereikite į &lt;span style=&quot; font-weight:600;&quot;&gt;Įrenginių&lt;/span&gt; kortelę&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Pasirinkite &lt;span style=&quot; font-weight:600;&quot;&gt;Pridėti įrenginį&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Jūs gausite šiai formai užpildyti reikalingą PIN kodą. PIN kodas galios tik &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minučių&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2182,9 +1627,38 @@
         <translation>Susikurkite savo paskyrą</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Užregistruokite savo naudotojo vardą Ring sistemoje. Tai rezervuos naudotojo vardą ir tokiu būdu tik jūs galėsite jį naudoti. Jūsų draugai galės jums skambinti, vietoj jūsų RingID, naudodami jūsų naudotojo vardą.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Kuriama jūsų Ring paskyra...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Perkeliama jūsų Ring paskyra...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_ms.ts

diff --git a/translations/ring_client_windows_ms.ts b/translations/ring_client_windows_ms.ts
index bcfee29..03cc3c9 100644
--- a/translations/ring_client_windows_ms.ts
+++ b/translations/ring_client_windows_ms.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Aplikasi Ring untuk Microsoft Windows.
-Ring adalah aplikasi komunikasi yang sulit dan tersebar.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Alamat server</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nama pengguna</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP diaktifkan</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Benarkan Panggilan Daripada TidaK Diketahui</translation>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Tetapan Akaun Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Main</translation>
     </message>
@@ -588,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Pindah</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Tambahkan sebagai kenalan</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Tambahkan sebagai kenalan</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Salin nombor</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Utama</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Akaun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nama</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Eksport</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Terima</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Hapus</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Batal</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Tetapan</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfigurasi</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Tentang</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1513,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1552,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1592,52 +1104,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfigurasi</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_nb.ts

diff --git a/translations/ring_client_windows_nb.ts b/translations/ring_client_windows_nb.ts
index 08ee495..5455eb2 100644
--- a/translations/ring_client_windows_nb.ts
+++ b/translations/ring_client_windows_nb.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Windows-klienten for Ring.
-Ring er sikker og distribuert kommunikasjonsprogramvare.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Vertsnavn</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Brukernavn</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP aktivt</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Tillat anrop fra ukjente</translation>
@@ -161,23 +169,12 @@
         <translation>Offentlig brukernavn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Ring offentlig registrert brukernavn</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Registrer brukernavn på blokkjede-knapp</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registrer på blokkjeden</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Endrer passord…</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Kontoinnstillinger for Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Tillat anrop fra ukjente -avkryssningsboks</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Spill av</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Legg til enhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>For å legge en ny enhet til din Ring-konto, eksporterer du din konto på Ring. Dette vil generere en PIN som må skrives inn på din nye enhet i løpet av 5 minutter.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Avbryt</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Verifisert eksporter på DHT for enhetslenking -knapp</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Eksporter på Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>Din genererte PIN:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Bruk forvalgte krypteringsalgoritmer</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pause</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Velg fil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Vent mens din PIN blir generert.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Nettverksfeil. Prøv igjen senere.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Feil passord.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registrerer… Dette kan ta litt tid</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>eksisterende kontaktliste</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>kontaktnummertekstoverføring -oppføring</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>eller slå nummer…</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Overfør samtale-knapp</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Overfør</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Søk i kontakter eller skriv inn ringID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Samtaler</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring er fri programvare for universell kommunikasjon som respekteret privatlivets fred for dets brukere.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Søk etter kontakttekst -inndata</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Vis QR-kode for ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Del ring ID -knapp</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dobbeltklikk for å kopiere</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Feil ved generering av QR-kode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Tilbake til hjemmeside -knapp</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Legg til kontakter</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Ønsker å snakke med deg!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Svar innkommende anrop -knapp </translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Ignorer innkommende anrop -knapp</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Svar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Vis QR-kode for ring ID</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Del ring ID -knapp</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dobbeltklikk for å kopiere</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Feil ved generering av QR-kode</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Tilbake til hjemmeside -knapp</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Legg til kontakter</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Ønsker å snakke med deg!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Svar innkommende anrop -knapp </translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Ignorer innkommende anrop -knapp</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Svar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Avbryt utgående anrop</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Fjern kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopier nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Kontakt meg på Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Min RingID er:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Melding ankommer fra %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Innkommende anrop fra %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Innstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Fane for grunnleggende oppsett</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Generell</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Oppsettsfane for lyd/video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Lyd/Bilde</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Oppsettsfane for kontoer</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Kontoer</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>avslutt innstillingsmeny</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Historikkinnstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Behold historikk i (dager)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Velg 0 for ubegrenset historikk)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Nullstill historikk</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Ymse innstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Behold minimert ved lukking</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Se etter oppdateringer nå</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (klikk for å bytte)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Vis navnetekst-inndata</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Navn</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Antall dager å beholde historikk</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>tøm historikk -knapp</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Opptaksinnstillinger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Lagre i:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Sti for anropshistorikk</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>Alltid ta opp samtaler -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Alltid ta opp</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>behold minimisert ved lukking -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>skru på merknader -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Skru på varsler</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Kjør Ring ved oppstart -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Automatisk oppdateringssjekker -avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Se etter oppdatering hver</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Intervall mellom oppdateringssjekker i dager -velger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dager</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Se etter oppdateringer nå -knapp</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Forhåndsvisning utilgjengelig under samtale</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Enhetsvalg</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Videoenhetsvelger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Enhet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Oppløsning</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Videoenhets-oppløsnings-velger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Utgangsenhet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Lydutdataenhet-velger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Inngangsenhet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Lydinndataenhets-velger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Ny kontotype-velger</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>legg til ny konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Slett konto-knapp</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Eksporter konto -knapp</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Eksporter</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Kjør Ring ved oppstart</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Ny konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Er du sikker på at du vil tømme all din historikk?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Velg mappe</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Eksisterende kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>søk etter eksisterende kontakttekst -oppføring</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Søk…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>eksisterende kontaktliste</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Opprett ny kontakt -knapp</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Opprett ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Ny kontaktnavnstekst -oppføring</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Skriv inn navn her…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>Veifiser kontaktopprettelse -knapp</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Opprett</translation>
-    </message>
-</context>
-<context>
-    <name>ContactRequestWidget</name>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Skjema</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="28"/>
-        <source>Incoming Contact Request</source>
-        <translation>Innkommende kontaktforespørsel</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="87"/>
-        <source>nameLabel</source>
-        <translation>navneEtikett</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="103"/>
-        <source>bestIdLabel</source>
-        <translation>BesteID-etikett</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="125"/>
-        <source>Accept contact request button</source>
-        <translation>Godta kontaktforespørsels-knapp</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aksepter</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Forespørsel om demping av kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Avslå</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Bannlys kontaktforespørsel</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokker</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - kontosletting</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Ønsker du virkelig å slette kontoen?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Denne handlingen kan ikke endres</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Hvis denne kontoen ikke har blitt eksportert, eller lagt til på en annen enhet, vil den gå tapt</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Avbryt kontosletting -knapp</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Slett</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Verifiser kontaktsletting -knapp</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Oppsett</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Velg fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Fant ingen forvalgt e-postklient</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>Kvalitetsglidebryter</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Automatisk kvalitet-avkryssningsboks</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Skjema</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>KontaktID</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>HUSKELISTE: Forklar meningen med en kontaktforespørsel</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Send kontaktforespørsel</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Samtale på vent</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Sludre</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Legg person til samtale</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Overfør samtale</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Demp mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Ta opp samtale</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kvalitet</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Ta del i samtaler</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Navneetikett</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Forløpt tid</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Oppsett</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Legg på</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Demp video</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Del hele skjermen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Del skjermområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Del fil</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Flytter din Ring-konto…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-arkivfiler (*.gz);; Alle filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Opprett Ring-konto</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Velkommen til</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For å lenke denne enheten til en annen konto, må du først &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;skaffe en PIN-kode&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For å generere denne 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Kontobehandlingsinnstilling&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Velg &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-kontoen&lt;/span&gt; du ønsker å bruke&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Enheter&lt;/span&gt;-fanen&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Legg til 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du vil få den nødvendinge PIN-koden for å fullføre dette skjemaet. den er gyldig i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Opprett din profil</translation>
@@ -1793,11 +1257,6 @@
         <translation>Søker…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registrer brukernavnet ditt på Ring. Dette vil reservere brukernavnet ditt slik at du kan bruke det. Dine venner vil kunne ringe deg med ditt brukernavn istedenfor din RingID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Velkomstdialog</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Opprett Ring-konto -knapp</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Trykknapp for start av Ring-kontoopprettelse -utløser</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Lenk konto fra fil</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Velg fil å importere</translation>
@@ -1908,6 +1386,11 @@
         <translation>Tekstoppføring for fullt navn -inndata</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>Offentlig brukernavn -avkryssningsboks</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Oppretter din Ring-konto…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Velkomstlogo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Opprett Ring-konto -knapp</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Trykknapp for start av Ring-kontoopprettelse -utløser</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Opprett Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Lenk enhet -knapp</translation>
@@ -2098,29 +1566,6 @@
         <translation>Hvordan legge til en enhet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For å lenke denne enheten til en annen konto, må du først &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;skaffe en PIN-kode&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;For å generere denne 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Kontobehandlingsinnstilling&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Velg &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-kontoen&lt;/span&gt; du ønsker å bruke&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå til &lt;span style=&quot; font-weight:600;&quot;&gt;Enheter&lt;/span&gt;-fanen&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Legg til 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du vil få den nødvendinge PIN-koden for å fullføre dette skjemaet. den er gyldig i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Velg fil å importere</translation>
@@ -2182,9 +1627,38 @@
         <translation>Opprett din konto</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registrer brukernavnet ditt på Ring. Dette vil reservere brukernavnet ditt slik at du kan bruke det. Dine venner vil kunne ringe deg med ditt brukernavn istedenfor din RingID.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Oppretter din Ring-konto…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Flytter din Ring-konto…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-arkivfiler (*.gz);; Alle filer (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_nl.ts

diff --git a/translations/ring_client_windows_nl.ts b/translations/ring_client_windows_nl.ts
index 95c0ee7..258922d 100644
--- a/translations/ring_client_windows_nl.ts
+++ b/translations/ring_client_windows_nl.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>De Microsoft Windows-cliënt voor Ring.
-Ring is software voor beveiligde en gedistribueerde communicatie.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Hostnaam</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP ingeschakeld</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Oproepen van onbekenden toestaan</translation>
@@ -161,23 +169,12 @@
         <translation>Openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Openbaar geregistreerde Ring-gebruikersnaam</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Knop gebruikersnaam registreren op de blokketen</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registreren op blokketen</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Wachtwoord wijzigen…</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring-accountinstellingen</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Selectievakje oproepen van onbekenden toestaan</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Afspelen</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Apparaat toevoegen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Annuleren</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Knop export op DHT voor apparaten koppelen bevestigen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exporteren naar de Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>Je gegenereerde pincode:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Standaardcodering gebruiken</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pauze</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>Ring-ID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Kies bestand</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Bestanden (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Je pincode wordt gegenereerd, even geduld.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Netwerkfout, probeer het later opnieuw.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Verkeerd wachtwoord.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Bezig met registreren… Dit kan even duren</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>bestaande contactenlijst</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>tekstinvoer contactoverdrachtnummer</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>of voer een nummer in…</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Knop gesprek overdragen</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Overdracht</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Zoek contacten of voer een Ring-ID in</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Tekstinvoer contact zoeken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Toon QR-code voor Ring-ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Knop Ring-ID delen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dubbelklik om te kopiëren</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Fout bij het aanmaken van QR-code</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Knop terug naar startpagina</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Aan contacten toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Wil met je praten!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Knop inkomende oproep beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Knop inkomende oproep negeren</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Toon QR-code voor Ring-ID</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Knop Ring-ID delen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dubbelklik om te kopiëren</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Fout bij het aanmaken van QR-code</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Knop terug naar startpagina</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Aan contacten toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Wil met je praten!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Knop inkomende oproep beantwoorden</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Knop inkomende oproep negeren</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Beantwoorden</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Uitgaande oproep annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Gesprek wissen</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Contact verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Contact blokkeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contacteer mij via Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mijn Ring-ID is:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Inkomend bericht van %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Inkomende oproep van %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Tabblad algemene configuratie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Tabblad audio-/videoconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Tabblad accountconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Accounts</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>instellingen sluiten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Geschiedenisinstellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Geschiedenis bewaren voor (dagen)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Kies 0 voor onbeperkte geschiedenis)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Geschiedenis wissen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Div. instellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Minimaliseren bij sluiten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Nu controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profiel</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (klik om te wijzigen)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Tekstinvoer getoonde naam</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Aantal dagen dat geschiedenis bijgehouden moet worden</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>knop geschiedenis wissen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Opname-instellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Opslaan in:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Pad voor gespreksopnamen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>Selectievakje oproepen altijd opnemen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Altijd opnemen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>selectievakje minimaliseren bij sluiten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>selectievakje meldingen inschakelen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Meldingen inschakelen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Selectievakje Ring automatisch starten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Selectievakje automatisch controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Automatisch controleren op updates elke</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Selectie interval in dagen tussen controles op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dagen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Knop nu controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Voorbeeldweergave niet beschikbaar gedurende oproep</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Apparaatselectie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Selectie video-apparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Apparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Resolutie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Selectie video-apparaatresolutie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Uitvoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Selectie audio-uitvoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Invoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Selectie audio-invoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Selectie nieuw accounttype</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>nieuwe account toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Knop account verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Knop account exporteren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exporteren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Ring automatisch starten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Account aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Weet je zeker dat je de geschiedenis wil wissen?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Map kiezen</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Bestaand contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>tekstinvoer zoeken naar bestaand contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Zoeken…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>bestaande contactenlijst</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Knop nieuw contact aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Nieuw contact aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nieuw contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Tekstinvoer nieuwe contactnaam</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Voer hier een naam in…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>Knop aanmaken contact bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Aanmaken</translation>
-    </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="125"/>
-        <source>Accept contact request button</source>
-        <translation>Knop contactverzoek aanvaarden</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aanvaarden</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Contactverzoek dempen</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Verwerpen</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Contactverzoek verbannen</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokkeren</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - accountverwijdering</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Weet je zeker dat je dit account wilt verwijderen?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Deze handeling kan niet ongedaan gemaakt worden</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Als deze account nog niet geëxporteerd is of nog niet toegevoegd is aan een ander apparaat, zal ze verloren gaan</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Knop account verwijderen annuleren</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Knop contact verwijderen bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Oké</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuratie</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Bestand kiezen</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Geen standaard-e-mailprogramma gevonden</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>Schuifbalk kwaliteit</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Selectievakje automatische kwaliteit</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
-        <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 versturen</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Telefoongesprek in wacht</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Chat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Persoon aan gesprek toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Gesprek overdragen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Microfoon dempen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Gesprek opnemen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kwaliteit</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Gesprekken samenvoegen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Naamlabel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tijd verstreken</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Ophangen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Video uitschakelen</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Scherm delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Schermgebied delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Bestand delen</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Je Ring-account wordt gemigreerd…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-archiefbestanden (*.gz);; Alle bestanden (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring-account aanmaken</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Welkom bij</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Om dit apparaat aan een andere account te koppelen moet je eerst &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;een pincode verkrijgen&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuten&lt;/span&gt; &lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;geldig.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Maak je profiel aan</translation>
@@ -1793,11 +1257,6 @@
         <translation>Zoeken…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registreer je gebruikersnaam op de Ring, zodat enkel jij ze kan gebruiken. Je vrienden zullen je kunnen bellen met je gebruikersnaam ipv je Ring-ID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Dialoogvenster</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Knop Ring-account aanmaken</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Trekker voor starten van aanmaken van Ring-account na druk op knop</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Account koppelen van bestand</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Kies een bestand om te importeren</translation>
@@ -1908,6 +1386,11 @@
         <translation>Tekstinvoer voor volledige naam</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>Selectievakje openbare gebruikersnaam</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Je Ring-account wordt aangemaakt…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Welkomstlogo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Knop Ring-account aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Trekker voor starten van aanmaken van Ring-account na druk op knop</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring-account aanmaken</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Knop apparaat koppelen</translation>
@@ -2098,29 +1566,6 @@
         <translation>Hoe voeg ik een apparaat toe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Om dit apparaat aan een andere account te koppelen moet je eerst &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;een pincode verkrijgen&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuten&lt;/span&gt; &lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;geldig.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Kies een bestand om te importeren</translation>
@@ -2182,9 +1627,38 @@
         <translation>Maak je account aan</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Je Ring-account wordt aangemaakt…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Je Ring-account wordt gemigreerd…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-archiefbestanden (*.gz);; Alle bestanden (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_nl_BE.ts

diff --git a/translations/ring_client_windows_nl_BE.ts b/translations/ring_client_windows_nl_BE.ts
index 344bd0a..6ea6e81 100644
--- a/translations/ring_client_windows_nl_BE.ts
+++ b/translations/ring_client_windows_nl_BE.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>De Microsoft Windows-cliënt voor Ring.
-Ring is software voor beveiligde en gedistribueerde communicatie.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Hostnaam</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP ingeschakeld</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Oproepen van onbekenden toelaten</translation>
@@ -161,23 +169,12 @@
         <translation>Openbare gebruikersnaam</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Openbaar geregistreerde Ring-gebruikersnaam</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Knop gebruikersnaam registreren op de blokketen</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registreren op de blokketen</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Paswoord wijzigen…</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring-accountinstellingen</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Selectievak Oproepen van onbekenden toestaan</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Afspelen</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Apparaat toevoegen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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 uw Ring-account toe te voegen, dient u uw account exporteren naar de Ring. Dit zal een pincode genereren die u binnen de 5 minuten op uw nieuw apparaat moet invoeren.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Annuleren</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Knop export op DHT voor apparaten koppelen bevestigen</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exporteren naar de Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>Uw gegenereerde pincode:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Standaardcodering gebruiken</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pauze</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>Ring-ID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Kies een bestand</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Bestanden (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Uw pincode word gegenereerd, even geduld.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Netwerkfout, probeer het later opnieuw.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Verkeerd paswoord.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Bezig met registreren… Dit kan even duren</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>bestaande contactenlijst</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>tekstinvoer contactoverdrachtnummer</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>of voer een nummer in…</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Knop gesprek overdragen</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Overdracht</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Zoekt contacten of voer een Ring-ID in</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>Toon gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Gesprekken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Tekstinvoer contact zoeken</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Toon QR-code voor Ring-ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Knop Ring-ID delen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dubbelklik voor te kopiëren</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Fout bij aanmaken van QR-code</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Knop terug naar startpagina</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Aan contacten toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>Toon uitgenodigden</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>Uitgenodigden</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Wilt met u spreken!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Knop inkomende oproep beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Knop inkomende oproep negeren</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Beantwoorden</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Toon QR-code voor Ring-ID</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Knop Ring-ID delen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dubbelklik voor te kopiëren</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Fout bij aanmaken van QR-code</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Knop terug naar startpagina</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Aan contacten toevoegen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>Toon uitgenodigden</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>Uitgenodigden</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Wilt met u spreken!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Knop inkomende oproep beantwoorden</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Knop inkomende oproep negeren</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Beantwoorden</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Negeren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Uitgaande oproep annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>Video-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>Audio-oproep starten</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Wis het gesprek</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Account verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Blokkeer contact</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Nummer kopiëren</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contacteer mij via Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mijn Ring-ID is:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Inkomend bericht van %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Inkomende oproep van %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Tabblad algemene configuratie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Tabblad audio-/videoconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Tabblad accountconfiguratie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Accounts</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>instellingen sluiten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Geschiedenisinstellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Geschiedenis bewaren voor (dagen)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Kies 0 voor onbeperkte geschiedenis)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Geschiedenis wissen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Diverse instellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Minimaliseren bij sluiten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Nu controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profiel</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (klikt voor te wijzigen)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Tekstinvoer getoonde naam</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Aantal dagen dat de geschiedenis moet worden bijgehouden</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>knop geschiedenis wissen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Opname-instellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Opslaan in:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Pad voor gespreksopnames</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>Oproepen altijd opnemen selectievak</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Altijd opnemen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Minimaliseren bij sluiten selectievak</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>Meldingen inschakelen selectievak</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Meldingen inschakelen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Selectievakske Ring automatisch starten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Selectievakske automatisch controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Automatisch controleren op updates elke</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Selectie interval in dagen tussen controles op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dagen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Knop nu controleren op updates</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Voorbeeldweergave nie beschikbaar gedurende oproep</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Apparaatselectie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Selectie videoapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Apparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Resolutie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Selectie videoapparaatresolutie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Uitvoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Selectie audio-uitvoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Invoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Selectie audio-invoerapparaat</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Selectie nieuw accounttype</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>nieuwen account toevoegen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Knop account verwijderen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Knop account exporteren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exporteren</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Ring automatisch starten</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Account aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Zij’ ge zeker da’ ge de geschiedenis wild wissen?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Map kiezen</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Bestaand contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>tekstinvoer zoeken naar bestaand contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Zoeken…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>bestaande contactenlijst</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Knop nieuw contact aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Nieuw contact aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nieuw contact</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Tekstinvoer nieuwe contactnaam</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Voerd hier ne naam in…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>Knop aanmaken contact bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Aanmaken</translation>
-    </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="125"/>
-        <source>Accept contact request button</source>
-        <translation>Knop contactverzoek aanvaarden</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aanvaarden</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Contactverzoek dempen</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Verwerpen</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Contactverzoek verbannen</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokkeren</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - accountverwijdering</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Zij’ ge zeker da’ ge dezen account wild verwijderen?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Deze handeling kan nie ongedaan worden gemaakt</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Als dezen account nog nie is g’exporteerd of nog nie is toegevoegd aan een ander apparaat, gaad hij verloren gaan</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Knop account verwijderen annuleren</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Verwijderen</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Annuleren</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Knop contact verwijderen bevestigen</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Oké</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuratie</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Afsluiten</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Kies een bestand</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Bestanden (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Geen standaard-e-mailprogramma gevonden</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>Schuifbalk kwaliteit</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Selectievakske automatische kwaliteit</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulier</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>Contact-ID</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 versturen</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Telefoongesprek in wacht</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Babbel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Persoon toevoegen aan gesprek</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Gesprek overdragen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Microfoon dempen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Gesprek opnemen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kwaliteit</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Gesprekken samenvoegen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Naamlabel</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tijd verstreken</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuratie</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Ophangen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Video uitschakelen</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Scherm delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Schermgebied delen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Bestand delen</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Uwe Ring-account word gemigreerd…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-archiefbestanden (*.gz);; Alle bestanden (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring-account aanmaken</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Welkom bij</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Voor dit apparaat aan nen anderen account te koppelen moe’ g’eerst&lt;/span&gt; &lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;een pincode verkrijgen&lt;/span&gt;. &lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Voor 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ga naar &lt;span style=&quot; font-weight:600;&quot;&gt;d’accountbeheerinstellingen&lt;/span&gt; van een vorig apparaat&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Kiesd de &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-account&lt;/span&gt; die ge wild gebruiken&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ga naar het tabblad &lt;span style=&quot; font-weight:600;&quot;&gt;&lt;/li&gt;Apparaten
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecteerd &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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Ge zuld de pincode krijgen die ge nodig hebd voor dit proces te voltooien. De pincode is slechts &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuten&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; geldig.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Maakt uw profiel aan</translation>
@@ -1793,11 +1257,6 @@
         <translation>Zoeken…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <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>Registreerd uwe gebruikersnaam op de Ring, zodat enkel gij ze kund gebruiken. Uw vrienden gaan u kunnen bellen aan d’hand van uwe gebruikersnaam ipv uwe Ring-ID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Dialoogvenster</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Knop Ring-account aanmaken</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Trekker voor starten van aanmaken van Ring-account na druk op knop</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Account koppelen van bestand</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Kiesd een bestand voor t’importeren</translation>
@@ -1908,6 +1386,11 @@
         <translation>Tekstinvoer voor volledige naam</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>Selectievakske openbare gebruikersnaam</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Uwe Ring-account word aangemaakt…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Welkomstlogo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Knop Ring-account aanmaken</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Trekker voor starten van aanmaken van Ring-account na druk op knop</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring-account aanmaken</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Knop apparaat koppelen</translation>
@@ -2098,29 +1566,6 @@
         <translation>Hoe voeg ik een apparaat toe</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Voor dit apparaat aan nen anderen account te koppelen moe’ g’eerst&lt;/span&gt; &lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;een pincode verkrijgen&lt;/span&gt;. &lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Voor 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ga naar &lt;span style=&quot; font-weight:600;&quot;&gt;d’accountbeheerinstellingen&lt;/span&gt; van een vorig apparaat&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Kiesd de &lt;span style=&quot; font-weight:600;&quot;&gt;Ring-account&lt;/span&gt; die ge wild gebruiken&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Ga naar het tabblad &lt;span style=&quot; font-weight:600;&quot;&gt;&lt;/li&gt;Apparaten
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecteerd &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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Ge zuld de pincode krijgen die ge nodig hebd voor dit proces te voltooien. De pincode is slechts &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuten&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; geldig.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Kiesd een bestand voor t’importeren</translation>
@@ -2182,9 +1627,38 @@
         <translation>Maakt uwen account aan</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>Registreerd uwe gebruikersnaam op de Ring, zodat enkel gij ze kund gebruiken. Uw vrienden gaan u kunnen bellen aan d’hand van uwe gebruikersnaam ipv uwe Ring-ID.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Uwe Ring-account word aangemaakt…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Uwe Ring-account word gemigreerd…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring-archiefbestanden (*.gz);; Alle bestanden (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

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 05db882..6485214 100644
--- a/translations/ring_client_windows_nl_NL.ts
+++ b/translations/ring_client_windows_nl_NL.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Gebruikersnaam</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Spelen</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Voeg toe aan contacten</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Voeg toe aan contacten</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopieër nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Instellingen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Algemeen</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Accounts</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Naam</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Verwijderen</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Bellen</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_pa.ts

diff --git a/translations/ring_client_windows_pa.ts b/translations/ring_client_windows_pa.ts
index 46937fd..76c3dca 100644
--- a/translations/ring_client_windows_pa.ts
+++ b/translations/ring_client_windows_pa.ts
@@ -31,8 +31,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -89,9 +89,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,6 +126,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
@@ -162,23 +171,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,11 +286,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"></translation>
@@ -319,7 +312,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -589,8 +581,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -615,13 +607,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -694,46 +686,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -772,639 +724,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>ਇਤਿਹਾਸ ਮਿਟਾਓ</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1427,25 +966,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>ਰਿੰਗ</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation type="unfinished">ਸੈਟਿੰਗ</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1501,12 +1040,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1514,33 +1053,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1553,32 +1089,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1593,52 +1106,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1648,7 +1141,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,17 +1149,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1680,7 +1173,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1720,12 +1213,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1744,20 +1232,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"></translation>
@@ -1785,11 +1259,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"></translation>
@@ -1811,12 +1280,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1855,6 +1329,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -1900,6 +1388,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
@@ -1968,7 +1461,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2030,21 +1523,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
@@ -2090,20 +1568,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -2165,8 +1629,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2249,7 +1742,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2289,7 +1782,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2329,7 +1822,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/ring_client_windows_pl.ts

diff --git a/translations/ring_client_windows_pl.ts b/translations/ring_client_windows_pl.ts
index d59e5d8..c171fdc 100644
--- a/translations/ring_client_windows_pl.ts
+++ b/translations/ring_client_windows_pl.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Klient Ring dla Microsoft Windows.
-Ring jest strzeżonym i rozdzielonym programem komunikacyjnym.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Nazwa hosta</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nazwa użytkownika</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP jest włączone</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Zezwól Na Połączenia Od Nieznanych</translation>
@@ -161,23 +169,12 @@
         <translation>Publiczna nazwa użytkownika</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Publicznie zarejestrowana nazwa Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Zarejestruj nazwę użytkownika w blockchain</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Zarejestruj w blockchain</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Zmienianie hasła...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ustawienia Konta Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Pole zezwolenia otrzymywania połączeń od nieznajomych</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Graj</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Dodaj urządzenie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>Są dwie możliwości dodawania nowego urządzenia do konta. Eksport  do pliku w ustawieniach konta. Plik ten jest chroniony hasłem, które trzeba podać przy dodawaniu konta z tego pliku do nowego urządzenia. Albo wygenerowanie kodu PIN, ważnego przez 5 minut, by dodać konto z sieci. Kod PIN wpisuje się potem łącznie z hasłem do naszego konta na urządzeniu, które chcemy dodać do konta.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Wyeksportuj konto Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Użyj domyślnych szyfrów</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pauza</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>ID Ring</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Wybierz Plik</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Pliki (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Błędne hasło.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>albo wpisz numer...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Przełaczenie</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Szukaj kontakty lub wpisz Ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Rozmowy</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Wystąpił błąd podczas generowania kodu QR.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Dodaj do kontaków</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Chce z tobą rozmawiać!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Odbierz</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Wystąpił błąd podczas generowania kodu QR.</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Dodaj do kontaków</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Chce z tobą rozmawiać!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Odbierz</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Zignoruj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Usuń kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Blokuj kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Skopiuj numer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Skontaktuj się ze mną na Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mój RingId to:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Przychodząca wiadomość od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Połączenie przychodzące od %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Generalne</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Wideo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Konta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>wyjdź z menu ustawień</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Ustawienia Historii</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Przechowaj historię do (dni)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Ustaw na 0 dla nieograniczonej historii)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Usuń historię</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Dodatkowe Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Przechowaj zminimalizowane przy zamknięciu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Imię</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Ustawienia Nagrań</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Zapisz w :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Zawsze Nagrywaj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Sprawdź po aktualizacje automatycznie co</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dni</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Podgląd jest niedostępny podczas rozmowy</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Wybierz Urządzenie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Urządzenie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Rozdzielczość</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Urządzenie Wyjściowe</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Urządzenie Wejściowe</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>dodaj nowe konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Wyeksportuj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Uruchom Ring przy Starcie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nowe konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Czy na pewno chcesz usunąć całą twoją historię?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Wybierz Folder</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Istniejący Kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Szukaj...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Stwórz nowy kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nowy kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Wpisz imię tutaj...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Stwórz</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Akceptuj</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokuj</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Usuń</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Anuluj</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfiguracja</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Wyjdź</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>O</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Wybierz Plik</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Pliki (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Nie znaleziono domyślnego klienta poczty</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automatycznie</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Forma</translation>
-    </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Rozmowa jest Zawieszona</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Czat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Dodaj osobę do rozmowy</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Przełącz rozmowę</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Wyłącz mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Jakość</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Dołącz Do Rozmów</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Etykieta Nazwiska</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Czas się skończył</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfiguracja</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Odłożyć słuchawkę</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Wyłącz video</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Podziel się obszarem ekranu</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Podziel się obszar ekranu</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Podziel się plikiem</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Stwórz swój profil</translation>
@@ -1784,11 +1257,6 @@
         <translation>Szukam...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generowanie twojego konta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation>Stwórz konto</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Generowanie twojego konta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 8e8a40a..4a0aee2 100644
--- a/translations/ring_client_windows_pl_PL.ts
+++ b/translations/ring_client_windows_pl_PL.ts
@@ -31,8 +31,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -89,9 +89,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"></translation>
     </message>
@@ -122,6 +126,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"></translation>
@@ -162,23 +171,12 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"></translation>
     </message>
@@ -288,11 +286,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"></translation>
@@ -319,7 +312,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation type="unfinished"></translation>
     </message>
@@ -589,8 +581,8 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -615,13 +607,13 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -694,46 +686,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -772,639 +724,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"></translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"></translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1427,25 +966,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1501,12 +1040,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1514,33 +1053,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
-<context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"></translation>
     </message>
 </context>
@@ -1553,32 +1089,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1593,52 +1106,32 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1648,7 +1141,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1656,17 +1149,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"></translation>
     </message>
@@ -1680,7 +1173,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1720,12 +1213,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1744,20 +1232,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"></translation>
@@ -1785,11 +1259,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"></translation>
@@ -1811,12 +1280,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -1855,6 +1329,20 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -1900,6 +1388,11 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"></translation>
@@ -1968,7 +1461,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2030,21 +1523,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"></translation>
@@ -2090,20 +1568,6 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"></translation>
@@ -2165,8 +1629,37 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2249,7 +1742,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2289,7 +1782,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
@@ -2329,7 +1822,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"></translation>
     </message>
 </context>

translations/ring_client_windows_pt.ts

diff --git a/translations/ring_client_windows_pt.ts b/translations/ring_client_windows_pt.ts
index d4621e0..daccbd4 100644
--- a/translations/ring_client_windows_pt.ts
+++ b/translations/ring_client_windows_pt.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -79,7 +79,7 @@
     <message>
         <location filename="../accountdetails.ui" line="250"/>
         <source>Parameters</source>
-        <translation type="unfinished"/>
+        <translation>Parâmetros</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="280"/>
@@ -87,9 +87,13 @@
         <translation>Nome do host</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Usuário</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP habilitado</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -273,7 +271,7 @@
     <message>
         <location filename="../accountdetails.ui" line="770"/>
         <source>Ok</source>
-        <translation type="unfinished"/>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="783"/>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,9 +310,8 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
-        <translation type="unfinished"/>
+        <translation>Reproduzir</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="971"/>
@@ -359,7 +351,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1336"/>
         <source>Registration</source>
-        <translation type="unfinished"/>
+        <translation>Registo</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1356"/>
@@ -374,7 +366,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1397"/>
         <source>Network Interface</source>
-        <translation type="unfinished"/>
+        <translation>Interface da Rede</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1418"/>
@@ -480,7 +472,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1844"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation type="unfinished"/>
+        <translation>Negociação de Sessão SDP (caso falhe o ICE)</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1872"/>
@@ -569,7 +561,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2488"/>
         <source>Devices</source>
-        <translation type="unfinished"/>
+        <translation>Dispositivos</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2491"/>
@@ -587,9 +579,9 @@
         <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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"/>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation>Exportar na rede</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -613,13 +605,13 @@
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -635,7 +627,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2712"/>
         <source>PIN</source>
-        <translation type="unfinished"/>
+        <translation>PIN</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2722"/>
@@ -665,7 +657,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1495"/>
         <source>Published Address</source>
-        <translation type="unfinished"/>
+        <translation>Endereço Publicado</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2254"/>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Use cifras padrão</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transferir</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>O Jami é um software livre para comunicação universal que respeita as liberdades e a privacidade dos seus utilizadores.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Adicionar aos contactos</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
-        <source>Ignore</source>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Adicionar aos contactos</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Resposta</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
+        <source>Ignore</source>
+        <translation>Ignorar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Contas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Configurações do Histórico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nova Conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aceitar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation type="unfinished"/>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,37 +1051,34 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
-</context>
-<context>
     <name>RingButton</name>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation>Bate-papo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
@@ -1646,25 +1139,25 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
-        <translation type="unfinished"/>
+        <translation>Tirar Som ao Vídeo</translation>
     </message>
 </context>
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Compartilhar tela</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Anexar arquivo</translation>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,23 +1230,9 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
-        <translation type="unfinished"/>
+        <translation>Criar o seu perfil</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="564"/>
@@ -1769,7 +1243,7 @@
         <location filename="../wizarddialog.ui" line="629"/>
         <location filename="../wizarddialog.cpp" line="178"/>
         <source>Create your account</source>
-        <translation type="unfinished"/>
+        <translation>Criar a sua conta</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="730"/>
@@ -1780,12 +1254,7 @@
         <location filename="../wizarddialog.ui" line="749"/>
         <location filename="../wizarddialog.cpp" line="264"/>
         <source>Searching...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <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>A pesquisar...</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="33"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Gerando sua conta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2129,7 +1593,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="450"/>
         <source>Create your profile</source>
-        <translation type="unfinished"/>
+        <translation>Criar o seu perfil</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="482"/>
@@ -2160,11 +1624,40 @@
         <location filename="../wizardwidget.ui" line="629"/>
         <location filename="../wizardwidget.cpp" line="167"/>
         <source>Create your account</source>
+        <translation>Criar a sua conta</translation>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2201,7 +1694,7 @@
         <location filename="../wizardwidget.ui" line="749"/>
         <location filename="../wizardwidget.cpp" line="253"/>
         <source>Searching...</source>
-        <translation type="unfinished"/>
+        <translation>A pesquisar...</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="778"/>
@@ -2247,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Gerando sua conta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 d92b7ee..9ee5619 100644
--- a/translations/ring_client_windows_pt_BR.ts
+++ b/translations/ring_client_windows_pt_BR.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>O cliente Microsoft Windows para Ring
-Ring é um software de comunicação distribuído e seguro.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Servidor</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nome de usuário</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP ativado</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Aceitar Chamada de Desconhecido</translation>
@@ -161,23 +169,12 @@
         <translation>Usuário publico</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Usuário publico registrado no Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Botão de registar usuário no blockchain</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registrar no blockchain</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Mudando senha...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Configurações de Conta do Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Caixa de seleção &quot;permitir chamada de desconhecidos&quot;</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Reproduzir</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Cancelar</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Valida exportação via DHT para o botão de vinculação de dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exportar no Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>Seu PIN gerado:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Utilizar cifras padrão</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pausar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Escolher Arquivo</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Arquivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Por favor aguarde enquanto seu PIN é gerado.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Erro de Rede. Por favor tente novamente mais tarde.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Senha Incorreta.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registrando... Isto pode tomar algum tempo</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>lista de contatos existente</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>Campo de entrada de texto do número de transferência do contato</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ou digite um número...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Botão de transferência de chamada</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transferência</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Busque por contatos ou insira o RingID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>Mostrar conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para busca de contato </translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Mostrar código QR do seu ID do Ring</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Botão para compartilhar o seu Id do Ring</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Duplo-clique para copiar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Erro ao gerar o Código QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Botão para voltar à página inicial</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Adicionar aos contatos</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>Mostrar convites</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>Convida</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Quer conversar com você!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Botão para atender chamada</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Botão para ignorar chamada</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Resposta</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Mostrar código QR do seu ID do Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Botão para compartilhar o seu Id do Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Duplo-clique para copiar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Erro ao gerar o Código QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Botão para voltar à página inicial</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Adicionar aos contatos</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>Mostrar convites</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>Convida</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Quer conversar com você!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Botão para atender chamada</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Botão para ignorar chamada</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Resposta</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>Iniciar videochamada</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>Iniciar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Eliminar a conversa</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Remover contato</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Bloquear contato</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Encontre-me no Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Meu RingID é : </translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Recebendo mensagem de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Recebendo chamada de %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Aba de configurações gerais</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Aba de configurações de áudio/vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Áudio/Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Aba de configuração de contas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Contas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>fechar menu de configurações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Configurações de histórico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Manter histórico por (dias)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Insira 0 para histórico ilimitado)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Limpar histórico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Configurações diversas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Manter minimizado ao fechar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Checar por atualizações agora</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (clique para mudar)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Entrada de texto para exibir nome</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Número de dias que o histórico será mantido</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>Botão para limpar histórico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Configurações de Gravação</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Salvar em :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Diretório das chamadas gravadas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>Caixa de seleção para sempre gravar as chamadas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Sempre gravar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Caixa de seleção para manter minimizado ao fechar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>Caixa de seleção para habilitar notificações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Ativar notificações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Caixa de seleção para executar o Ring na inicialização</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Caixa de seleção para verificar atualizações automaticamente</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Verificar atualizações automaticamente a cada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Seletor do intervalo da verificação de atualizaçôes em dias</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dias</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Botão para verificar atualizações agora</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Pré-visualização não disponível em chamadas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Seleção de dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Seletor de dispositivo de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Resolução</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Seletor de resolução do dispositivo de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Dispositivo de saída</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Seletor de dispositivo de saída de áudio</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Dispositivo de entrada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Seletor de dispositivo de entrada de áudio</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Seletor de novo tipo de conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>adicionar nova conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Botão para apagar conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Botão para exportar conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Executar o Ring ao iniciar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nova conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Você tem certeza que deseja limpar todo o seu histórico?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Escolher diretório</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Contato existente</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>Entrada de texto para busca de contato existente</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Procurando...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>lista de contatos existentes</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Botão para criar novo contato</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Criar novo contato</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Novo Contato</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Entrada de texto para nome do novo contato</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Entre um nome aqui...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>Botão de validação de criação de contato</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Criar</translation>
-    </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>Requisição de Contato Recebida</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="87"/>
-        <source>nameLabel</source>
-        <translation>Alias de Nome</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="103"/>
-        <source>bestIdLabel</source>
-        <translation>Alias de bestID</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="125"/>
-        <source>Accept contact request button</source>
-        <translation>Botão para aceitar solicitação de contato</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aceitar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Ignorar solicitação de contato</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Descartar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Banir solicitação de contato</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bloquear</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - remoção de conta</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Tem certeza que deseja deletar sua conta?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Esta ação é irreversível</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Se esta conta não foi exportada, ou adicionada a outro dispositivo, ela será perdida</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Botão para cancelar exclusão de contato</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Deletar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Botão para validar exclusão de contato</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ok</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuração</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Escolher Arquivo</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Arquivos (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Cliente de e-mail não encontrado</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>Seletor de qualidade</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Caixa de seleção para qualidade automática</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automático</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>ID de Contato</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>A FAZER: Explicar o motivo de uma requisição de contato</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Enviar requisição de contato</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Chamada em espera</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Conversa</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Adicionar pessoa a conversa</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Transferir chamada</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Desativar microfone</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Gravar chamada</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Qualidade</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Juntar chamadas</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Nome do rótulo</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tempo decorrido</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Desligar</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Desativar vídeo</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Compartilhar tela inteira</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Compartilhar área da tela</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Compartilhar arquivo</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrando sua conta do Ring...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Arquivos do Ring (*.gz);; Todos arquivos (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Criar uma conta Ring</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Bem-vindo ao</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para conectar este dispositivo em outra conta, você primeiro &lt;/span&gt;precisa obter um código PIN.&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; para gerar um código PIN,&lt;/span&gt;&lt;/span&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá para a &lt;span style=&quot; font-weight:600;&quot;&gt;Configuração de administração da conta&lt;/span&gt; de um dispositivo anterior&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Escolha a opção &lt;span style=&quot; font-weight:600;&quot;&gt;Conta Ring&lt;/span&gt; que você quer usar&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá para a &lt;span style=&quot; font-weight:600;&quot;&gt;aba de dispositivos&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecione &lt;span style=&quot; font-weight:600;&quot;&gt;Adicionar um 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Você irá receber o PIN necessário para completar este formulário. Este PIN só será válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Criar um Perfil</translation>
@@ -1793,11 +1257,6 @@
         <translation>Buscando...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registre seu usuário no Ring. Isto irá reservar o usuário para que apenas você possa o utilizar. Seus amigos serão capazes de contatá-lo com seu usuário ao invés de com seu RingID</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Caixa de diálogo do assistente</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Botão para criar conta Ring</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Botão para acionar a criação da conta do Ring</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Associar conta a partir do arquivo</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Selecione um arquivo para importar</translation>
@@ -1908,6 +1386,11 @@
         <translation>Campo de texto para inserir o nome completo</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>Caixa de seleção para nome de usuário público</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Criando sua conta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Logotipo de boas-vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Botão para criar conta Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Botão para acionar a criação da conta do Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Criar uma conta Ring</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Botão para associar dispositivo</translation>
@@ -2098,29 +1566,6 @@
         <translation>Como adicionar um dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para conectar este dispositivo em outra conta, você primeiro &lt;/span&gt;precisa obter um código PIN.&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; para gerar um código PIN,&lt;/span&gt;&lt;/span&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá para a &lt;span style=&quot; font-weight:600;&quot;&gt;Configuração de administração da conta&lt;/span&gt; de um dispositivo anterior&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Escolha a opção &lt;span style=&quot; font-weight:600;&quot;&gt;Conta Ring&lt;/span&gt; que você quer usar&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá para a &lt;span style=&quot; font-weight:600;&quot;&gt;aba de dispositivos&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecione &lt;span style=&quot; font-weight:600;&quot;&gt;Adicionar um 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Você irá receber o PIN necessário para completar este formulário. Este PIN só será válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Selecione um arquivo para importar</translation>
@@ -2182,9 +1627,38 @@
         <translation>Criar uma conta</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registre seu usuário no Ring. Isto irá reservar o usuário para que apenas você possa o utilizar. Seus amigos serão capazes de contatá-lo com seu usuário ao invés de com seu RingID</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Criando sua conta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrando sua conta do Ring...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Arquivos do Ring (*.gz);; Todos arquivos (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_pt_PT.ts

diff --git a/translations/ring_client_windows_pt_PT.ts b/translations/ring_client_windows_pt_PT.ts
index 45e43d7..63152a7 100644
--- a/translations/ring_client_windows_pt_PT.ts
+++ b/translations/ring_client_windows_pt_PT.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>O cliente Microsoft Windows para o Ring
-O Ring é um programa de comunicação distribuído e seguro.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Servidor</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nome de utilizador</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP ativado</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Aceitar Chamada de Desconhecido</translation>
@@ -161,23 +169,12 @@
         <translation>Nome de utilizador público</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Nome de utilizador público registado no Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Botão de registar nome de utilizador na cadeia de blocos</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registar na cadeia de blocos</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>A alterar palavra-chave...</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Configurações da Conta Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Caixa de visto &quot;Aceitar Chamadas de Desconhecidos&quot;</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Reproduzir</translation>
     </message>
@@ -481,7 +472,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1844"/>
         <source>SDP Session Negotiation (ICE Fallback)</source>
-        <translation>Negociação de Sessão SDP (ICE Fallback)</translation>
+        <translation>Negociação de Sessão SDP (caso falhe o ICE)</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1872"/>
@@ -588,9 +579,9 @@
         <translation>Adicionar dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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, deve exportar sua conta no Ring. Isso irá gerar um PIN que deve ser introduzido no seu novo dispositivo dentro de 5 minutos desde a sua geração.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation>Exportar na rede</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Cancelar</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Valida a exportação via DHT para o botão de associação do dispositivo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Exportar no Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>O seu PIN gerado:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Utilizar cifras padrão</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pausar</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Escolher Ficheiro</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Ficheiros (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Por favor aguarde enquanto o seu PIN é gerado.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Erro de Rede. Por favor tente novamente mais tarde.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Palavra-chave errada.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>A registar... Isto pode levar algum tempo</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>lista de contactos existentes</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>campo de entrada de texto do número de transferência do contacto</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ou digite um número...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Botão de transferência de chamada</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Transferir</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Pesquisar contactos ou inserir o RingID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>Ver conversações</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Conversas</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>O Ring é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Entrada de texto para pesquisa de contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Mostrar código QR do seu ID do Ring</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Botão para partilhar o seu ID do Ring</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Duplo-clique para copiar</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Erro ao gerar o Código QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>O Jami é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Botão para voltar à página inicial</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Adicionar aos contactos</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>Mostrar convites</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>Convites</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Quer conversar consigo!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Botão para atender chamada</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Botão para ignorar chamada</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Resposta</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Mostrar código QR do seu ID do Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Botão para partilhar o seu ID do Ring</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Duplo-clique para copiar</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Erro ao gerar o Código QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation>melhor nome</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation>melhor Id</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Botão para voltar à página inicial</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Adicionar aos contactos</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>Mostrar convites</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>Convites</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Quer conversar consigo!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Botão para atender chamada</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Botão para ignorar chamada</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Resposta</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Cancelar chamada efetuada</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>Começar chamada de vídeo</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>Começar chamada de áudio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Limpar conversação</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Remover contacto</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Bloquear contacto</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Copiar número</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Contacte-me no Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>O meu RingID é: </translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>A receber mensagem de %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>A receber chamada de %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Configurações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation>Aba de configurações gerais</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Geral</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Aba de configurações de áudio / vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Áudio/Vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Aba de configuração de contas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Contas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>fechar menu de configurações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Configurações de Histórico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Manter Histórico por (dias)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(usar 0 para histórico ilimitado)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Limpar Histórico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Configurações Diversas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Manter minimizado ao fechar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Verificar se existem atualizações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Perfil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (clique para alterar)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Entrada de texto para nome mostrado</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nome</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Número de dias em que o histórico será mantido</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>botão para limpar histórico</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Configurações de Gravação</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Gravar em :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Diretório das chamadas gravadas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>Caixa de visto &quot;Gravar sempre as chamadas&quot;</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Gravar Sempre</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Caixa de visto &quot;Manter minimizado ao fechar&quot;</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>Caixa de visto &quot;Ativar notificações&quot;</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Ativar notificações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Caixa de visto &quot;Executar o Ring ao iniciar&quot;</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Caixa de visto &quot;Verificar atualizações automaticamente&quot;</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Verificar atualizações automaticamente a cada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Seletor do intervalo em dias entre verificação de atualizações</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dias</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Botão para verificar atualizações agora</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Pré-visualização não disponível em chamadas</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Seleção de Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Seletor de dispositivo de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Dispositivo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Resolução</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Seletor de resolução do dispositivo de vídeo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Dispositivo de Saída</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Seletor de dispositivo de saída de áudio</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Dispositivo de Entrada</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Seletor de dispositivo de entrada de áudio</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Seletor de novo tipo de conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>adicionar nova conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Botão para eliminar conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Botão para exportar conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Executar o Ring ao iniciar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nova Conta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Tem a certeza que deseja eliminar todo o seu histórico?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Escolher Diretório</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Contacto Existente</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>Entrada de texto para pesquisar contacto existente</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Pesquisar...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>lista de contactos existentes</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Botão para criar novo contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Criar novo contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Novo Contato</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Entrada de texto para nome do novo contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Introduza um nome aqui...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>Botão de validação de criação de contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Criar</translation>
-    </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>Pedido de Contacto Recebido</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="87"/>
-        <source>nameLabel</source>
-        <translation>Rótulo do nome</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="103"/>
-        <source>bestIdLabel</source>
-        <translation>Rótulo do BestID</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="125"/>
-        <source>Accept contact request button</source>
-        <translation>Botão para aceitar pedido de contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Aceitar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Ignorar pedido de contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Descartar</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Banir pedido de contacto</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bloquear</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - eliminação de conta</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Tem certeza que quer eliminar a sua conta?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Esta ação é irreversível</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Se esta conta não foi exportada ou adicionada a outro dispositivo, ela será perdida</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Botão para cancelar eliminação de contacto</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Eliminar</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Cancelar</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Botão para validar eliminação de contacto</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Configurações</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Configuração</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Escolher Ficheiro</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Ficheiros (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Cliente de e-mail padrão não encontrado</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>Seletor de qualidade</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Caixa de visto para qualidade automática</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Automático</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulário</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>ID de Contato</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>A FAZER: explicar o motivo de um pedido de contacto</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Enviar pedido de contacto</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Chamada em Espera</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Conversa</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Adicionar pessoa à conversa</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Transferir chamada</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Desativar Microfone</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Gravar chamada</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Qualidade</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Juntar Chamadas</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Rótulo do nome</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Tempo decorrido</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Configuração</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Desligar</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Tirar Som ao Vídeo</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Partilhar ecrã inteiro</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Partilhar área do ecrã</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Partilhar ficheiro</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>A migrar a sua conta do Ring...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ficheiro do Ring (*.gz);; Todos os ficheiros (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Criar uma conta Ring</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Bem-vindo(a) ao</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para associar este dispositivo a outra conta, primeiro &lt;/span&gt;tem de obter um código PIN.&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Para gerar um código PIN,&lt;/span&gt;&lt;/span&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá a &lt;span style=&quot; font-weight:600;&quot;&gt;Configurações da gestão da conta&lt;/span&gt; de um dispositivo anterior&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Escolha a opção &lt;span style=&quot; font-weight:600;&quot;&gt;Conta Ring&lt;/span&gt; que quer usar.&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Aceda à &lt;span style=&quot; font-weight:600;&quot;&gt;aba de dispositivos&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecione &lt;span style=&quot; font-weight:600;&quot;&gt;Adicionar um 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Irá receber o PIN necessário para completar este formulário. Este PIN só será válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Criar o seu perfil</translation>
@@ -1793,11 +1257,6 @@
         <translation>A pesquisar...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <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>Registe o seu nome de utilizador no Ring. Isto irá reservar o nome de utilizador para que apenas você o possa utilizar. Os seus amigos serão capazes de contactá-lo com seu nome de utilizador em vez do seu RingID</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Caixa de Diálogo do Assistente</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Botão para criar conta Ring</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Botão para acionar a criação da conta do Ring</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Associar conta a partir do ficheiro</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Selecione o ficheiro a importar</translation>
@@ -1908,6 +1386,11 @@
         <translation>Campo de texto para inserir o nome completo</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>Caixa de visto para o nome público de utilizador</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>A gerar a sua conta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Logótipo de Boas-Vindas</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Botão para criar conta Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Botão para acionar a criação da conta do Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Criar uma conta Ring</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Botão para associar dispositivo</translation>
@@ -2098,29 +1566,6 @@
         <translation>Como adicionar um dispositivo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Para associar este dispositivo a outra conta, primeiro &lt;/span&gt;tem de obter um código PIN.&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; Para gerar um código PIN,&lt;/span&gt;&lt;/span&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Vá a &lt;span style=&quot; font-weight:600;&quot;&gt;Configurações da gestão da conta&lt;/span&gt; de um dispositivo anterior&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Escolha a opção &lt;span style=&quot; font-weight:600;&quot;&gt;Conta Ring&lt;/span&gt; que quer usar.&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt; Aceda à &lt;span style=&quot; font-weight:600;&quot;&gt;aba de dispositivos&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Selecione &lt;span style=&quot; font-weight:600;&quot;&gt;Adicionar um 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Irá receber o PIN necessário para completar este formulário. Este PIN só será válido por &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutos&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Selecione o ficheiro a importar</translation>
@@ -2182,9 +1627,38 @@
         <translation>Criar a sua conta</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>Registe o seu nome de utilizador no Ring. Isto irá reservar o nome de utilizador para que apenas você o possa utilizar. Os seus amigos serão capazes de contactá-lo com seu nome de utilizador em vez do seu RingID</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>A gerar a sua conta Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>A migrar a sua conta do Ring...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ficheiro do Ring (*.gz);; Todos os ficheiros (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

translations/ring_client_windows_ro.ts

diff --git a/translations/ring_client_windows_ro.ts b/translations/ring_client_windows_ro.ts
index 7f60fe2..6966902 100644
--- a/translations/ring_client_windows_ro.ts
+++ b/translations/ring_client_windows_ro.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>Hostname</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Nume de utilizator</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Redare</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring este un software gratuit pentru comunicații universale care respectă libertățile individuale și dorința de anonimitate a utilizatorilor.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Adaugă la contacte</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Adaugă la contacte</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>General</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Conturi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Nume</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation type="unfinished"/>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Șterge</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Suna</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Setari</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation type="unfinished"/>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation type="unfinished"/>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation type="unfinished"/>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_ru.ts

diff --git a/translations/ring_client_windows_ru.ts b/translations/ring_client_windows_ru.ts
index 130c1a0..80f1cee 100644
--- a/translations/ring_client_windows_ru.ts
+++ b/translations/ring_client_windows_ru.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Клиент Ring для Microsoft Windows.
-Ring – это приложение с распределённой архитектурой для безопасного общения.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Имя компьютера</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP разрешен</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Разрешать звонки от незнакомых лиц</translation>
@@ -161,23 +169,12 @@
         <translation>Публичное имя пользователя</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Зарегистрировать в блокчейн</translation>
     </message>
@@ -224,7 +221,7 @@
     <message>
         <location filename="../accountdetails.ui" line="632"/>
         <source>Old password input line</source>
-        <translation type="unfinished"/>
+        <translation>Строка ввода старого пароля</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="641"/>
@@ -239,7 +236,7 @@
     <message>
         <location filename="../accountdetails.ui" line="669"/>
         <source>New password text input</source>
-        <translation type="unfinished"/>
+        <translation>Ввод текста нового пароля</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="675"/>
@@ -254,17 +251,17 @@
     <message>
         <location filename="../accountdetails.ui" line="705"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation>Ввод текста подтверждения пароля</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="711"/>
         <source>Input confirmation </source>
-        <translation type="unfinished"/>
+        <translation>Подтверждение ввода</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="727"/>
         <source>New pass confirmation</source>
-        <translation type="unfinished"/>
+        <translation>Подтверждение нового пароля</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="751"/>
@@ -279,7 +276,7 @@
     <message>
         <location filename="../accountdetails.ui" line="783"/>
         <source>Cancel password change button</source>
-        <translation type="unfinished"/>
+        <translation>Кнопка отмены смены пароля</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="798"/>
@@ -287,24 +284,19 @@
         <translation>Изменение пароля…</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Настройки аккаунта Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Флажок Разрешить вызов из неизвестного</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="874"/>
         <source>Allow Call From History checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Флажок Разрешить вызов из истории</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="892"/>
         <source>Allow Call From Contact checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Флажок Разрешить вызов из контакта</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="931"/>
@@ -314,18 +306,17 @@
     <message>
         <location filename="../accountdetails.ui" line="955"/>
         <source>Play ringtone button</source>
-        <translation type="unfinished"/>
+        <translation>Кнопка воспроизведения мелодии звонка</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Проиграть</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="971"/>
         <source>ringtone file selector</source>
-        <translation type="unfinished"/>
+        <translation>селектор файлов мелодий звонка</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1021"/>
@@ -370,7 +361,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1372"/>
         <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation>Поле счётчика таймаута регистрации</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1397"/>
@@ -415,7 +406,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1597"/>
         <source>ip address text input</source>
-        <translation type="unfinished"/>
+        <translation>ввод текста ip-адреса</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1612"/>
@@ -540,22 +531,22 @@
     <message>
         <location filename="../accountdetails.ui" line="2313"/>
         <source>User certificate selector</source>
-        <translation type="unfinished"/>
+        <translation>Выбор сертификата пользователя</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2371"/>
         <source>private key password input</source>
-        <translation type="unfinished"/>
+        <translation>ввод пароля закрытого ключа</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2393"/>
         <source>User private key selector</source>
-        <translation type="unfinished"/>
+        <translation>Селектор закрытого ключа пользователя</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2417"/>
         <source>Encrypt media stream (SRTP) checkbox</source>
-        <translation type="unfinished"/>
+        <translation>Флажок шифровать поток мультимедиа (SRTP) </translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2420"/>
@@ -565,7 +556,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2432"/>
         <source>use default ciphers checkbox</source>
-        <translation type="unfinished"/>
+        <translation>флажок Использовать шифры по умолчанию</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2488"/>
@@ -580,7 +571,7 @@
     <message>
         <location filename="../accountdetails.ui" line="2535"/>
         <source>Add device button</source>
-        <translation type="unfinished"/>
+        <translation>Кнопка Добавить устройство</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2538"/>
@@ -588,14 +579,14 @@
         <translation>Добавить устройство</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation>Ввод текста пароля</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2584"/>
@@ -614,14 +605,14 @@
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Экспорт в сеть Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Использовать стандартные шифры</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Пауза</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Выберите файл</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Файлы (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Пожалуйста, подождите, пока генерируется ваш PIN.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Ошибка сети. Пожалуйста, повторите попытку позднее.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Неверный пароль.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Регистрация… Это может занять некоторое время</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -752,7 +703,7 @@
     <message>
         <location filename="../bannedcontactswidget.ui" line="41"/>
         <source>Banned contacts list</source>
-        <translation type="unfinished"/>
+        <translation>Список запрещенных контактов</translation>
     </message>
     <message>
         <location filename="../bannedcontactswidget.ui" line="69"/>
@@ -771,680 +722,267 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>или введите номер...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Передача</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Найдите контакты или введите Ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
-        <translation type="unfinished"/>
+        <translation>Показать беседы</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Разговоры</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Показать Ring ID QR код</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Двойной клик для копирования</translation>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>Jami — свободная программа для связи, уважающая свободу и конфиденциальность пользователей.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Ошибка при создании QR кода</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Добавить в контакты</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Хочет поговорить с вами!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Ответить</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Показать Ring ID QR код</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Двойной клик для копирования</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Ошибка при создании QR кода</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Кнопка возврата на главную страницу</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Добавить в контакты</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>Показать приглашения</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>Приглашения</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Хочет поговорить с вами!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Кнопка ответа на входящий вызов </translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Кнопка игнорирования входящего вызова</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Ответить</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Отменить исходящий вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
-        <translation type="unfinished"/>
+        <translation>Начать видеовызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
-        <translation type="unfinished"/>
+        <translation>Начать голосовой вызов</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
-        <translation type="unfinished"/>
+        <translation>Очистить разговор</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Удалить контакт</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Заблокировать контакт</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Копировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Свяжись со мной в Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Мой Ring ID:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Сообщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Звонок от %1</translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Общее</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Аудио/Видео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Аккаунты</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>выйти из меню настроек</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Настройки истории</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Хранить историю (дней)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Установите 0 для неограниченного хранения)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Очистить историю</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Другие настройки</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Сворачивать вместо закрытия</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Проверить обновления</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Профиль</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Аватар (нажмите для изменения)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Настройки записи</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Сохранить в:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Путь для записей разговоров</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Всегда записывать</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Включить уведомления</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Проверять обновления автоматически каждые</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>дней</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Предпросмотр недоступен во время звонка</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Выбор устройства</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Устройство</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Разрешение</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Устройство вывода</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Устройство ввода</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>добавить новый аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Экспорт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Запускать Ring при старте системы</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Новый аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Вы уверены, что хотите удалить всю историю? </translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Выбрать папку</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Существующий контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Поиск...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Создать новый контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Новый контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Введите имя…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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>Входящий запрос на добавление в контакты</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Принять</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Отклонить</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Заблокировать запрос на добавление в контакты</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Заблокировать</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - удаление аккаунта</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Вы действительно хотите удалить аккаунт?</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Это действие будет невозможно отменить</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>Если этот аккаунт не был экспортирован или привязан к другому устройству, он будет потерян</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
     <message>
         <location filename="../invitebuttonswidget.ui" line="72"/>
         <source>Accept invite</source>
-        <translation type="unfinished"/>
+        <translation>Принять приглашение</translation>
     </message>
     <message>
         <location filename="../invitebuttonswidget.ui" line="104"/>
         <source>Ignore invite</source>
-        <translation type="unfinished"/>
+        <translation>Отклонить приграшение</translation>
     </message>
     <message>
         <location filename="../invitebuttonswidget.ui" line="136"/>
         <source>Block person</source>
-        <translation type="unfinished"/>
+        <translation>Блокировать личность</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Настройка</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>О программе</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Выберите файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -1513,71 +1051,45 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Не найден почтовый клиент по умолчанию</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Авто</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
         <source>Select folder</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Форма</translation>
-    </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>Отправить запрос на добавление в контакты</translation>
+        <translation>Выбрать папку</translation>
     </message>
 </context>
 <context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Звонок приостановлен</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Добавить человека к звонку</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Передать звонок</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Выключить микрофон</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Записать разговор</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Качество</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Присоединиться к звонкам</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Прошло времени</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Настройка</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Повесить трубку</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Выключить видео</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Транслировать весь экран</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Транслировать область экрана</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Поделиться файлом</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Переносим ваш аккаунт Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Архивы Ring (*.gz);; Все файлы (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Создать аккаунт Ring</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Добро пожаловать в</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Для привязки этого устройства к другому аккаунту вам сначала &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;/span&gt;нужно получить PIN&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; код. Чтобы сгенерировать 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Перейдите в &lt;span style=&quot; font-weight:600;&quot;&gt;настройки аккаунта&lt;/span&gt; на предыдущем устройстве&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Выберите нужный &lt;span style=&quot; font-weight:600;&quot;&gt;аккаунт Ring&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Перейдите на вкладку &lt;span style=&quot; font-weight:600;&quot;&gt;Устройства&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Выберите &lt;span style=&quot; font-weight:600;&quot;&gt;Добавить устройство&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Вы получите PIN, необходимый для заполнения этой формы. PIN код действителен только в течение &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 минут&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Создайте свой профиль</translation>
@@ -1793,14 +1257,9 @@
         <translation>Поиск…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Зарегистрируйте свое имя пользователя в Ring. Это зарезервирует имя пользователя, так что только вы сможете его использовать. Ваши друзья смогут связаться с вами по вашему имени вместо RingID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Диалог Мастера</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="36"/>
@@ -1819,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1863,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Выберите файл для импорта</translation>
@@ -1908,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1950,7 +1433,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="814"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation>Ввод текста пароля</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="820"/>
@@ -1966,7 +1449,7 @@
         <location filename="../wizarddialog.ui" line="853"/>
         <location filename="../wizarddialog.ui" line="859"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation>Ввод текста подтверждения пароля</translation>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="865"/>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Создание вашего аккаунта Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2015,7 +1498,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="33"/>
         <source>Wizard Dialog</source>
-        <translation type="unfinished"/>
+        <translation>Диалог Мастера</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="36"/>
@@ -2038,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Создать аккаунт Ring</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2098,29 +1566,6 @@
         <translation>Как добавить устройство</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Для привязки этого устройства к другому аккаунту вам сначала &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;&lt;/span&gt;нужно получить PIN&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; код. Чтобы сгенерировать 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Перейдите в &lt;span style=&quot; font-weight:600;&quot;&gt;настройки аккаунта&lt;/span&gt; на предыдущем устройстве&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Выберите нужный &lt;span style=&quot; font-weight:600;&quot;&gt;аккаунт Ring&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Перейдите на вкладку &lt;span style=&quot; font-weight:600;&quot;&gt;Устройства&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Выберите &lt;span style=&quot; font-weight:600;&quot;&gt;Добавить устройство&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Вы получите PIN, необходимый для заполнения этой формы. PIN код действителен только в течение &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 минут&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Выберите файл для импорта</translation>
@@ -2182,9 +1627,38 @@
         <translation>Создайте свой аккаунт</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Зарегистрируйте свое имя пользователя в Ring. Это зарезервирует имя пользователя, так что только вы сможете его использовать. Ваши друзья смогут связаться с вами по вашему имени вместо RingID.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2240,7 +1714,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="814"/>
         <source>Password text input</source>
-        <translation type="unfinished"/>
+        <translation>Ввод текста пароля</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="820"/>
@@ -2256,7 +1730,7 @@
         <location filename="../wizardwidget.ui" line="853"/>
         <location filename="../wizardwidget.ui" line="859"/>
         <source>Password confirmation text input</source>
-        <translation type="unfinished"/>
+        <translation>Ввод текста подтверждения пароля</translation>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="865"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Создание вашего аккаунта Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Переносим ваш аккаунт Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Архивы Ring (*.gz);; Все файлы (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file

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 4c4c0a3..4a5ade7 100644
--- a/translations/ring_client_windows_ru_RU.ts
+++ b/translations/ring_client_windows_ru_RU.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Microsoft Windows клиент для Ring.
-Ring — программное обеспечение для защищённой связи с распределённой архитектурой.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Имя компьютера</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Имя пользователя</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP включен</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Воспроизвести</translation>
     </message>
@@ -588,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Пауза</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Выбрать файл</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Файлы (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Перевод</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Введите имя контакта или его ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Беседы</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Добавить контакт</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Хочет поговорить с вами!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Ответ</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Добавить контакт</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Хочет поговорить с вами!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Ответ</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Игнорировать</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Скопировать номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Мой RingId:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Входящее сообщение от %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Входящий вызов от %1</translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Основные</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Звук/Видео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Учетные записи</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>Выход из настроек</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Настройки Истории</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Сохранять историю  за ( Дней )</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Очистка истории</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Оставлять свернутым при закрытии</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Профиль</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Имя</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Настройки записи</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Сохранить в</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Проверять обновления каждые</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>дней</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Устройство</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Разрешение</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>добавить новую учетную запись</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Экспорт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Новая учетная запись</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Вы уверены что хотите удалить история поиска?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Выбрать каталог</translation>
-    </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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Поиск...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Создать новый контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Новый контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Введите имя здесь...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Принять</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Удалить</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Отмена</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Да</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Звонок</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Настройки</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Настройка</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Выход</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>О продукте</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Выбрать файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Файлы (*)</translation>
     </message>
@@ -1513,37 +1051,34 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Не найден почтовый клиент используемый по умолчанию</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Автоматически</translation>
-    </message>
-</context>
-<context>
     <name>RingButton</name>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Вызов на удержании</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Отключить микрофон</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Качество</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Прошедшее время</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Настройка</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Разъединить</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Громкость видео</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Общий доступ к экрану</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Поделится файлом</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Создать вашу учетную запись Ring</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Создать вашу учетную запись Ring</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_sk_SK.ts

diff --git a/translations/ring_client_windows_sk_SK.ts b/translations/ring_client_windows_sk_SK.ts
index 46252ee..9c084e7 100644
--- a/translations/ring_client_windows_sk_SK.ts
+++ b/translations/ring_client_windows_sk_SK.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>Hostname</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation type="unfinished"/>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP zapnuté</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation type="unfinished"/>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Spusť</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation>Pridaj zariadenie</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Vyber súbor</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Súbory (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Prenos</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Odpoveď</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Odpoveď</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Všeobecné</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Nastavenie účtov</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Nastavenia historie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Názov</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Zariadenie</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</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 existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Vytvor</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Vymaž</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Zruš</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Nastavenie</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfigurácia</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>O programe</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Vyber súbor</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Súbory (*)</translation>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfigurácia</translation>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation type="unfinished"/>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation type="unfinished"/>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,7 +1459,7 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,7 +1740,7 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
+        <source>Generating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_sl.ts

diff --git a/translations/ring_client_windows_sl.ts b/translations/ring_client_windows_sl.ts
index bb6f6bc..4dbd10b 100644
--- a/translations/ring_client_windows_sl.ts
+++ b/translations/ring_client_windows_sl.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Microsoft Windows odjemalec za Ring.
-Ring je varen in necentraliziran način komunikacije.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Strežnik</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Uporabnik</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP omogočen</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Dovoli klice nepoznanih klicateljev</translation>
@@ -161,23 +169,12 @@
         <translation>Javno ime</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Prijava na &apos;blockchain&apos;</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Nastavitve Ring računa</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Predvajaj</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Dodaj napravo</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <source>To add a new device to your Ring account, you export your account on the Ring. This will generate a pin that must be entered on your new device within 5 minutes of its generation.</source>
-        <translation>Za dodati novo napravo v tvoj Ring račun, moraš izvoziti tvoj račun na Ring. To bo ustvarilo PIN, ki ga moraš vnesti na novi napravi v roku 5 minut.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Izvozi v Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Uporabi privzete ćiperje</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pavza</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Izberi datoteko</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Datoteke (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Prosim počakaj, dokler PIN ni ustvarjen.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Napaka mreže. Prosim poskusi ponovno.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Napačno geslo.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Prijavljam... Lahko traj anekaj časa</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ali vpiši številko...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Prevezava</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Poišči stike ali vpiši RingID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Pogovori</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <source>Ring is free software for universal communication which respects the freedoms and privacy of its users.</source>
-        <translation>Ring je zastonj programska oprema za univerzalno komunikacijo, ki spoštuje svoboščine in zasebnost uporabnikov.</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>Kopiraj z dvojnim klikom</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Napaka med pripravo QR kode</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Dodaj v stike</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Želi govoriti s tabo!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Odgovori</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Kopiraj z dvojnim klikom</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Napaka med pripravo QR kode</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Dodaj v stike</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Želi govoriti s tabo!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Odgovori</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignoriraj</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Odstrani stik</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopiraj številko</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Poišči me na Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Moj RingID je:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Dohodno sporočilo od %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Dohodni klic od %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Nastavitve</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Splošno</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Avdio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Računi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>izhod iz nastavitev</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Nastavitve zgodovine</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Ohrani zgodovino za (dni)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Vpiši 0 za neomejeno zgodovino)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Počisti zgodovino</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Razne nastavitve</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Minimiziraj ob zaprtju</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Preveri posodobitve zdaj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Ime</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Nastavitve snemanja</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Shrani v :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Vedno snemaj</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Omogoči obvestila</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Samodejno preverjaj posodobitve vsakih</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dni</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Predogled ni možen med klicem</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Izbira naprave</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Naprava</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Resolucija</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Izhodna naprava</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Vhodna naprava</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>dodaj nov račun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Izvoz</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Zaženi Ring ob zagonu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nov račun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Ali resnično želiš počistiti vso zgodovino?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Izberi mapo</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Obstoječi račun</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Iščem...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Ustvari nov stik</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Nov stik</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Vpiši ime tukaj...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Ustvari</translation>
-    </message>
-</context>
-<context>
-    <name>ContactRequestWidget</name>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Obrazec</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="28"/>
-        <source>Incoming Contact Request</source>
-        <translation>Dohodna zahteva stika</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Sprejmi</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Opusti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blokiraj</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - brisanje računa</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Te operacije ni možno preklicati</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>Če ta račun ni bil izvožen ali dodan na drugo napravo, bo izgubljen</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Pobriši</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Prekliči</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>V redu</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Nastavitve</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfiguracija</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Izhod</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>O Ring</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Izberi datoteko</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Datoteke (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Ne najdem privzetega programa za e-pošto</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Samodejno</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Obrazec</translation>
-    </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>Pošlji zahtevo za stik</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Klic na čakanju</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Pogovor</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Dodaj osebo v klic</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Preveži klic</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Izključi mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kvaliteta</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Združi klice</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Oznaka imena</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Pretečeni čas</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfiguracija</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Prekini</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Izključi video</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Deli celoten zaslon</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Deli območje zaslona</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Deli datoteko</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migriram tvoj Ring račun...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ustvari Ring račun</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Poveži to napravo k računu</translation>
@@ -1743,20 +1230,6 @@
         <translation>Dobrodošli v</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Ustvari svoj profil</translation>
@@ -1784,11 +1257,6 @@
         <translation>Iščem...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ustvarjam tvoj Ring račun...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ustvari Ring račun</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation>Kako dodati napravo</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation>Ustvari svoj račun</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ustvarjam tvoj Ring račun...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migriram tvoj Ring račun...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_sq_AL.ts

diff --git a/translations/ring_client_windows_sq_AL.ts b/translations/ring_client_windows_sq_AL.ts
index 475a5aa..377020f 100644
--- a/translations/ring_client_windows_sq_AL.ts
+++ b/translations/ring_client_windows_sq_AL.ts
@@ -25,14 +25,13 @@
     <message>
         <location filename="../aboutdialog.ui" line="547"/>
         <source>Live Free or Die</source>
-        <translation type="unfinished"/>
+        <translation>Liri A Vdekje</translation>
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Klienti Ring për Microsoft Windows.
-Ring-u është një software komunikimi të siguruar dhe të shpërndarë.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Strehëemër</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Emër përdoruesi</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>Me Upnp të aktivizuar</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Lejo Thirrje Prej të Panjohurish</translation>
@@ -161,23 +169,12 @@
         <translation>Emër publik përdoruesi</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Emër përdoruesi regjistruar publikisht për Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>Buton Regjistroje emrin e përdoruesit në &lt;em&gt;blockchain&lt;/em&gt;</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Regjistroje në &lt;em&gt;blockchain&lt;/em&gt;</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>Po ndryshohet fjalëkalimi…</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Rregullime Llogarie Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>Kutizë Lejo thirrje prej të panjohurish</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Luaje</translation>
     </message>
@@ -370,7 +361,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1372"/>
         <source>Registration timeout selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation>Kutizë përzgjedhësi mbarimi kohe regjistrimi</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1397"/>
@@ -385,12 +376,12 @@
     <message>
         <location filename="../accountdetails.ui" line="1436"/>
         <source>local port selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation>kutizë përzgjedhësi porte lokale</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1522"/>
         <source>same as local radio button</source>
-        <translation>Buton Njësoj si radioja lokale</translation>
+        <translation>njësoj si buton rrethor lokal</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1528"/>
@@ -400,7 +391,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1546"/>
         <source>personalise address and ports radio button</source>
-        <translation>Buton rrethor Personalizoni adresë dhe porta</translation>
+        <translation>buton rrethor Personalizoni adresë dhe porta</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1552"/>
@@ -415,7 +406,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1597"/>
         <source>ip address text input</source>
-        <translation>Dhënie teksti adrese IP</translation>
+        <translation>dhënie teksti adrese IP</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1612"/>
@@ -425,7 +416,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1631"/>
         <source>port selector spinbox</source>
-        <translation type="unfinished"/>
+        <translation>kutizë përzgjedhësi porte</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1666"/>
@@ -446,7 +437,7 @@
     <message>
         <location filename="../accountdetails.ui" line="1710"/>
         <source>use TURN checkbox</source>
-        <translation>Kutizë për Përdor TURN</translation>
+        <translation>kutizë për Përdor TURN</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="1716"/>
@@ -588,9 +579,9 @@
         <translation>Shtoni pajisje</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>Që t’i shtoni llogarisë tuaj Ring një pajisje të re, eksportoni llogarinë tuaj në Ring. Kjo do të prodhojë një PIN që duhet dhënë te pajisja juaj e re brenda 5 minutash nga çasti i prodhimit.</translation>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>Anuloje</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>Buton vleftësimi eksporti nën DHT për lidhje pajisjesh</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Eksportoje në Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>PIN-i juaj i prodhuar:</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Përdor shifër parazgjedhje</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Pushim</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Zgjidhni Kartelë</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Kartela (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>Ju lutemi, pritni teksa prodhohet PIN-i juaj</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Gabim Rrjeti. Ju lutemi, riprovoni më vonë.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Fjalëkalim gabuar.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Po bëhet regjistrimi… Mund të dojë pak kohë</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>listë kontaktesh ekzistues</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>dhënie teksti për numër shpërnguljeje kontakti</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ose shtypni një numër…</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>Buton Shpërngule thirrjen</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Shpërngule</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <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="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>Shfaq biseda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Biseda</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>Dhënie teksti kërkimi kontakti</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>Shfaq kod QR ID-je Ring-u</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>Buton Ndani ID Ringu Me të Tjerët</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dyklikojeni që të kopjohet</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Gabim teksa prodhohej kodi QR</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>Jami ë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="1558"/>
-        <source>Back to homepage button</source>
-        <translation>Buton Mbrapsht te faqja hyrëse</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Shtoje te kontaktet</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>Shfaq ftesa</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>Ftesa</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Dëshiron të bisedojë me ju!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>Buton Përgjigjuni thirrjes ardhëse</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>Buton Shpërfille thirrjen ardhëse</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Përgjigjuni</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>Shfaq kod QR ID-je Ring-u</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>Buton Ndani ID Ringu Me të Tjerët</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dyklikojeni që të kopjohet</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Gabim teksa prodhohej kodi QR</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>Buton Mbrapsht te faqja hyrëse</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Shtoje te kontaktet</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>Shfaq ftesa</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>Ftesa</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Dëshiron të bisedojë me ju!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>Buton Përgjigjuni thirrjes ardhëse</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>Buton Shpërfille thirrjen ardhëse</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Përgjigjuni</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Shpërfille</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>Anuloje dërgimin e thirrjes</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>Filloni thirrje video</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>Filloni thirrje audio</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Pastroje bisedën</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Hiqe kontaktin</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Bllokojeni kontaktin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopjoje numrin</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Kontaktomëni në Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>RingID-ja ime është:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Mesazh ardhës nga %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Thirrje ardhur nga %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="97"/>
-        <source>General configuration tab</source>
-        <translation>Skedë formësimi të përgjithshëm</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Të përgjithshme</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>Skedë formësimi për Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Audio/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>Skedë formësimi llogarish</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Llogari</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>dil nga menu rregullimesh</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Rregullime Historiku</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Historikun mbaje për (ditë)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Vëreni 0 për historik të pakufizuar)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Pastroje Historikun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Rregullime të Ndryshme</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Mbaje të minimizuar kur dilet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Kontrollo tani për përditësime</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>Avatar (klikoni që ta ndryshoni)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>Dhënie teksti Emër në ekran</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Emër</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>Numër ditësh mbajtjeje historiku</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>Buton Pastro historikun</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Rregullime Incizimesh</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Ruaje në:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>Shteg regjistrimesh thirrjesh</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>Kutizë Incizo përherë thirrjet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Incizo Përherë</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>Kutizë Mbaje të minimizuar kur dilet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>Kutizë Aktivizo njoftimet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Aktivizo njoftime</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>Kutizë Nise Ring-un gjatë nisjes së sistemit</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>Kutizë Kontrolle të vetvetishme për përditësime</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Kontrollo vetvetiu për përditësime çdo</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>Përzgjedhës intervali mes kontrollesh për përditësime, në ditë</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>ditë</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>Buton Kontrollo tani për përditësime</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>S’bëhet dot paraparje gjatë thirrjesh</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Përzgjedhje Pajisjeje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>Përzgjedhës pajisje video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Pajisje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Qartësi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>Përzgjedhës qartësie pajisje video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Pajisje Në Dalje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>Përzgjedhës pajisje audio në dalje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Pajisje Në Hyrje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>Përzgjedhës pajisje audio në hyrje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>Përzgjedhës lloji llogari të re</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>Shtoni llogari të re</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>Buton Fshije llogarinë</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>Buton Eksportoni llogari</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Eksportoje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Nise Ring-un gjatë Nisjes së Sistemit</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Llogari e Re</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Jeni i sigurt se doni të pastrohet krejt historiku juaj?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Zgjidhni Drejtori</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Kontakt Ekzistues</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>dhënie teksti për kërkim në kontakte ekzistuese</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Kërkoni…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>listë kontaktesh ekzistues</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>Buton Krijoni kontakt të ri</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Krijoni kontakt të ri</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Kontakt i Ri</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>Dhënie teksti për Emër kontakti të ri</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>jepni këtu një emër…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>Buton vleftësimi krijimi kontakti</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Krijoje</translation>
-    </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>Kërkesë Kontakti e Ardhur </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="125"/>
-        <source>Accept contact request button</source>
-        <translation>Buton Prano kërkesë kontakti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Pranoje</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>Heshto kërkesë kontakti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Hidhe tej</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>Dëbo kërkesë kontakti</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Bllokoje</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - fshirje llogarie</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>Doni vërtet të fshihet llogaria?</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>Ky veprim është i paprapësueshëm </translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>Nëse kjo llogari s’është eksportuar, ose shtuar te një tjetër pajisje, do të humbë</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>Buton Anuloni fshirje kontakti</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Fshije</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Anuloje</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>Buton vleftësimi fshirjeje kontakti</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Rregullime</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Formësim</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Dalje</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Mbi</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Zgjidhni Kartelë</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Kartela (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>S’u gjet klient parazgjedhje poste</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>Përzgjedhës cilësie</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>Kutizë Cilësi automatike</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formular</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>ID kontakti</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>PËR-T’U-BËRË: Shpjego qëllimin e një kërkese për kontakt</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>Dërgoni kërkesë kontakti</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Thirrje Pezull</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Fjalosje</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Shtoni person për thirrje</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Shpërngulni thirrjen</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Heshtoje Mikrofonin</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>Incizo thirrjen</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Cilësi</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Merrni Pjesë Në Thirrje</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Etiketë emri</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Kohë e rrjedhur</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Formësim</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Mbylle</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Hiqi Zërin Videos</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Nda krejt ekranin</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Ndani me të tjerët zonën e ekranit</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Ndani kartelë me të tjerë</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Po migrohet llogaria juaj Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Kartela arkiv Ring-u (*.gz);; Krejt kartelat (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Krijoni llogari Ring</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>Mirë se vini te</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Për të lidhur këtë pajisje me një llogari tjetër, së pari &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;ju duhet të merrni një kod PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;. Për të prodhuar kodin 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shkoni te &lt;span style=&quot; font-weight:600;&quot;&gt;rregullimet Administrim llogarie&lt;/span&gt; të pajisjes së mëparshme&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Zgjidhni &lt;span style=&quot; font-weight:600;&quot;&gt;llogarinë Ring&lt;/span&gt; që doni të përdoret&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shkoni te skeda &lt;span style=&quot; font-weight:600;&quot;&gt;Pajisje&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Përzgjidhni &lt;span style=&quot; font-weight:600;&quot;&gt;Shtoni një pajisje&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Do të merrni PIN-in e nevojshëm për të plotësuar këtë formular. PIN-i është i vlefshëm vetëm për &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuta&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Krijoni profilin tuaj</translation>
@@ -1793,11 +1257,6 @@
         <translation>Po kërkohet…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <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>Regjistroni emrin tuaj të përdoruesit në Ring. Kjo do të sjellë rezervimin e emrit të përdoruesit për t’u përdorur vetëm nga ju. Shokët tuaj do të jenë në gjendje t’ju telefonojnë përmes emrit tuaj të përdoruesit, në vend se përmes ID-së tuaj në Ring.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>Dialog Ndihmësi</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Buton Krijoni llogari Ring</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Buton për të shkaktuar fillimin e krijimit të llogarisë Ring</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>Lidhni llogari prej kartele</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Përzgjidhni kartelë për importim</translation>
@@ -1908,6 +1386,11 @@
         <translation>Dhënie teksti për përpunim emri të plotë</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>Kutizë emri publik përdoruesi</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Po prodhohet llogaria juaj Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>Logo Mirëseardhjeje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>Buton Krijoni llogari Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Buton për të shkaktuar fillimin e krijimit të llogarisë Ring</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Krijoni llogari Ring</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>Buton Lidhni pajisje</translation>
@@ -2098,29 +1566,6 @@
         <translation>Si të shtohet një pajisje</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Për të lidhur këtë pajisje me një llogari tjetër, së pari &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;ju duhet të merrni një kod PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;. Për të prodhuar kodin 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shkoni te &lt;span style=&quot; font-weight:600;&quot;&gt;rregullimet Administrim llogarie&lt;/span&gt; të pajisjes së mëparshme&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Zgjidhni &lt;span style=&quot; font-weight:600;&quot;&gt;llogarinë Ring&lt;/span&gt; që doni të përdoret&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Shkoni te skeda &lt;span style=&quot; font-weight:600;&quot;&gt;Pajisje&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Përzgjidhni &lt;span style=&quot; font-weight:600;&quot;&gt;Shtoni një pajisje&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Do të merrni PIN-in e nevojshëm për të plotësuar këtë formular. PIN-i është i vlefshëm vetëm për &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuta&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>Përzgjidhni kartelë për importim</translation>
@@ -2182,9 +1627,38 @@
         <translation>Krijoni llogarinë tuaj</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>Regjistroni emrin tuaj të përdoruesit në Ring. Kjo do të sjellë rezervimin e emrit të përdoruesit për t’u përdorur vetëm nga ju. Shokët tuaj do të jenë në gjendje t’ju telefonojnë përmes emrit tuaj të përdoruesit, në vend se përmes ID-së tuaj në Ring.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Po prodhohet llogaria juaj Ring…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Po migrohet llogaria juaj Ring…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Kartela arkiv Ring-u (*.gz);; Krejt kartelat (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </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 1958299..d19a7af 100644
--- a/translations/ring_client_windows_sv.ts
+++ b/translations/ring_client_windows_sv.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Microsoft Windows-klient för Ring.
-Ring är säker och distribuerad kommunikationsmjukvara.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Värdnamn</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Användarnamn</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP aktiverad</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Tillåt samtal från okända</translation>
@@ -161,23 +169,12 @@
         <translation>Offentligt användarnamn</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Registrering i blockkedjan</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring-kontoinställningar</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Spela</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Lägg till enhet</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Export på Ring</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Använd standardshiffer</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Paus</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>Ring-ID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Välj fil</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Filer (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <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="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Nätverksfel. Försök igen senare.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Fel lösenord.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Registrerar... det kan ta lite tid.</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>eller ange nummer...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Överför</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Sök kontakter eller ange Ring-ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Konversationer</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>Jami är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet.</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>Dubbelklicka för att kopiera</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <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="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Lägg till i kontakter</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Vill prata med dig!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Svara</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Dubbelklicka för att kopiera</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <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="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Lägg till i kontakter</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Vill prata med dig!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Svara</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ignorera</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>Rensa konversation</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Ta bort kontakt</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>Blockera kontakt</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Kopiera nummer</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Kontakta mig på Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Mitt Ring-ID är:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Inkommande meddelande från %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Inkommande samtal från %1</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
+    <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Inställningar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Allmänt</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Ljud/Video</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Konton</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>Avsluta inställningsmenyn</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Historikinställningar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Spara historiken i (dagar)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(Ange 0 för obegränsad historik)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Rensa historik</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Div. inställningar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Minimera istället för att avsluta</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Sök efter uppdateringar nu</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Namn</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Inspelningsinställningar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Spara i :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Spela alltid in</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Aktivera aviseringar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Sök efter uppdateringar varje</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>dagar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Förhandsvisa otillgängliga under samtal</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Enheter</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Enhet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Upplösning</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Utdataenhet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Indataenhet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>Lägg till nytt konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Exportera</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Starta Ring vid systemstart</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Nytt konto</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Vill du verkligen rensa bort all din historik?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Välj mapp</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Befintlig kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Sök...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Skapa ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Ny kontakt</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Ange ett namn här...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Skapa</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Acceptera</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation>Ta bort</translation>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Blockera</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 really 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 contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Avbryt</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>OK</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Inställningar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Konfiguration</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Avsluta</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Välj fil</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Filer (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Ingen ordinarie e-postklient hittades</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Auto</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Formulär</translation>
-    </message>
-    <message>
-        <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>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Parkerat samtal</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Chatt</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Lägg till person till samtal</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Överför samtal</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Stäng av mikrofon</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Kvalitet</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Anslut till samtal</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Namnetikett</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Förfluten tid</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Konfiguration</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Lägg på</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Pausa video</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Dela hela skärmen</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Dela skärmområde</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Dela fil</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrerar ditt Ring-konto...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Skapa Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Koppla denna enhet till ett konto</translation>
@@ -1743,29 +1230,6 @@
         <translation>Välkommen till</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;För att länka enheten till ett annat konto, måste du först&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;få en PIN-kod&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;. För att genererea 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå till &lt;span style=&quot; font-weight:600;&quot;&gt;kontoinställningarna&lt;/span&gt; i en tidigare enhet&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå till fliken &lt;/li&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Enheter&lt;/span&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Välj&lt;/li&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Lägg till enhet&lt;/span&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du får då den nödvändiga PIN-koden för att slutföra detta formulär. PIN-koden är giltig endast i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Skapa din profil</translation>
@@ -1793,11 +1257,6 @@
         <translation>Söker...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Registrera ditt användarnamn på Ring. Detta reserverar användarnamnet så att endast du kan använda det. Dina vänner kan kontakt dig med ditt användarnamn istället för att använda ditt Ring-ID.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1819,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1863,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1908,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Genererar ditt Ring-konto...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Skapa Ring-konto</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2098,29 +1566,6 @@
         <translation>Hur man lägger till en enhet</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;För att länka enheten till ett annat konto, måste du först&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;få en PIN-kod&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;. För att genererea 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå till &lt;span style=&quot; font-weight:600;&quot;&gt;kontoinställningarna&lt;/span&gt; i en tidigare enhet&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Gå till fliken &lt;/li&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Enheter&lt;/span&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Välj&lt;/li&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Lägg till enhet&lt;/span&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;Du får då den nödvändiga PIN-koden för att slutföra detta formulär. PIN-koden är giltig endast i &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minuter&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2182,9 +1627,38 @@
         <translation>Skapa ditt konto</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Genererar ditt Ring-konto...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Migrerar ditt Ring-konto...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_tr.ts

diff --git a/translations/ring_client_windows_tr.ts b/translations/ring_client_windows_tr.ts
index 75e40c7..91ed2de 100644
--- a/translations/ring_client_windows_tr.ts
+++ b/translations/ring_client_windows_tr.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Microsoft Windows için Ring istemcisi.
-Ring güvenli ve dağıtık bir iletişim yazılımıdır.</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Sunucu adı</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Kullanıcı adı</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP etkin</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Bilinmeyenden Aramaya İzin Ver</translation>
@@ -161,23 +169,12 @@
         <translation>Herkese açık kullanıcı adı</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>Kayıt zinciri üzerinde kaydet</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring Hesap Ayarları</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Oynat</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>Aygıt ekle</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Ring&apos;de Dışa Aktar</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Öntanımlı şifrelemeyi kullan</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Duraklat</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>Ring Kimliği</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Dosya Seç</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Dosyalar (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>PIN&apos;iniz oluşturulurken lütfen bekleyin.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>Ağ Hatası. Lütfen daha sonra yeniden deneyin.</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>Yanlış parola</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>Kaydediliyor... Biraz zaman alabilir</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>ya da numara girin...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Aktarım</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Kişileri ara veya Ring kimliği gir</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Konuşmalar</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>Kopyalamak için çift tıkla</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>QR Kodu oluşturulurken hata</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Kişilere ekle</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Sizinle konuşmak istiyor!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Yanıtla</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>Kopyalamak için çift tıkla</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>QR Kodu oluşturulurken hata</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Kişilere ekle</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Sizinle konuşmak istiyor!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Yanıtla</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Göz ardı et</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>Kişiyi kaldır</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Numarayı kopyala</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Ring&apos;de benimle iletişime geç</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Ring kimliğim:</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>%1&apos;den gelen ileti</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>%1$s&apos;dan gelen arama</translation>
     </message>
 </context>
 <context>
-    <name>ConfigurationWidget</name>
-    <message>
-        <location filename="../configurationwidget.ui" line="20"/>
-        <source>Settings</source>
-        <translation>Ayarlar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Genel</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Ses/Görüntü</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Hesaplar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>ayarlar menüsünden çık</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Geçmiş Ayarları</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Geçmişi tutulacak gün sayısı:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(sınırsız geçmiş için 0 yapın)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Geçmişi Temizle</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Çeşitli Ayarlar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Kapatırken küçültülmüş olarak tut</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>Şimdi güncellemeleri denetle</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Profil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Ad</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Kayıt Ayarları</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Buraya kaydet :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Her Zaman Kaydet</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>Bildirimleri etkinleştir</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Güncellemeleri kendiliğinden denetle</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>gün</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Arama sırasında önizleme mevcut değil</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Aygıt Seçimi</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Aygıt</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Çözünürlük</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Çıkış Aygıtı</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Giriş Aygıtı</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>yeni hesap ekle</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Dışa aktar</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Ring&apos;i başlangıçta çalıştır</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Yeni Hesap</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Tüm geçmişinizi silmek istediğinizden emin misiniz?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Dizin Seç</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Var Olan Kişi</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Ara...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Yeni kişi oluştur</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Yeni Kişi</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Buraya bir ad girin...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <source>Create</source>
-        <translation>Oluştur</translation>
-    </message>
-</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Kabul et</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>Vazgeç</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Engelleme</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 really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </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>Eğer bu hesap dışa aktarılmazsa veya başka bir aygıta eklenmezse kaybedilecektir.</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Sil</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>İptal</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Tamam</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Ayarlar</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Yapılandırma</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Çıkış</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Hakkında</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Dosya Seç</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Dosyalar (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Varsayılan posta istemcisi bulunmadı</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Kendiliğinden</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>Form</translation>
-    </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>İletişim isteği gönder</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Çağrı Beklemede</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Sohbet</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Aramaya kişi ekle</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Aramayı aktar</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Mikrofonu kapat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Nitelik</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Çağrılara katıl</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>İsim etiketi</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Geçen zaman</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Yapılandırma</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Kapat</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Görüntüyü kapat</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Tüm ekranı paylaş</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Ekran alanı paylaş</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Dosya paylaş</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Ring hesabınız göç ettiriliyor...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring Hesabı Oluştur</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>Bu aygıtı bir hesaba bağla</translation>
@@ -1743,20 +1230,6 @@
         <translation>Hoş Geldiniz</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>Profilinizi oluşturun</translation>
@@ -1784,11 +1257,6 @@
         <translation>Arama yapılıyor...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Kullanıcı adınızı Ring sisteminde kaydedin. Bu işlem kullanıcı adınızı yalnızca sizin için ayıracak ve arkadaşlarınız sizi RingID&apos;niz yerine kullanıcı adınızı kullanarak arayabilecek.</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ring hesabınız oluşturuluyor...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>Ring Hesabı Oluştur</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation>Bir aygıt nasıl eklenir</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,9 +1627,38 @@
         <translation>Hesabınızı oluşturun</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>Kullanıcı adınızı Ring sisteminde kaydedin. Bu işlem kullanıcı adınızı yalnızca sizin için ayıracak ve arkadaşlarınız sizi RingID&apos;niz yerine kullanıcı adınızı kullanarak arayabilecek.</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ring hesabınız oluşturuluyor...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>Ring hesabınız göç ettiriliyor...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_uk.ts

diff --git a/translations/ring_client_windows_uk.ts b/translations/ring_client_windows_uk.ts
index 988e581..877694e 100644
--- a/translations/ring_client_windows_uk.ts
+++ b/translations/ring_client_windows_uk.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Клієнт Ring для Microsoft Windows.
-Ring - це безпечне і децентралізоване програмне забезпечення для спілкування</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>Ім&apos;я хоста</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>Ім’я</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP включено</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>Приймати дзвінки від невідомих контактів</translation>
@@ -161,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Налаштування аккаунту Ring</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>Програти</translation>
     </message>
@@ -588,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -614,13 +605,13 @@
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>Використовувати шифрувальники за замовчуванням</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>Пауза</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>Вибрати файл</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>Файли (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>або введіть номер...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>Переадресація</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>Знайти контакти або ввести ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>Групові чати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>Помилка при генерації QR-коду</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>Додати контакти</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>Хоче поговорити з вами!</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>Відповідь</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>Помилка при генерації QR-коду</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>Додати контакти</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>Хоче поговорити з вами!</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>Відповідь</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>Ігнорувати</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>Копіювати номер</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>Зв&apos;яжись зі мною за допомогою Ring</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>Моє RingId : </translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>Вхідне повідомлення від %1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>Вхідний виклик від %1</translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>Головні</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>Аудіо/Відео</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>Облікові записи</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>вийти з меню налаштуваннь</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>Налаштування історії</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>Зберігати історію протягом (дні)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>(встановити у 0 для безкінечної історії)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>Очистити історію</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>Додаткові параметри</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>Згортати вікно при закриванні</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>Профіль</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>Ім’я</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>Записати Налаштування</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>Зберегти в :</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>Завжди робити запис</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>Перевіряти оновлення автоматично кожні</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>днів</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>Попередній перегляд не доступний від час виклику</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>Вибір пристрою</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>Пристрій</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>Роздільна здатність</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>Пристрій Виведення</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>Пристрій Введення</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>додати новий контакт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>Експортувати</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>Завантажувати Ring разом з системою</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>Новий аккаунт</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>Ви все ще бажаєте очистити історію?</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>Обрати директорію</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>Існуючий контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>Пошук...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>Створити новий контакт...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>Новий контакт</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>Впишить тут ім’я...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>Прийняти</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>Заблокувати</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>Видалити</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>Відміна</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>Ок</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>Налаштування</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>Конфігурація</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>Вийти</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>Про программу</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>Вибрати файл</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>Файли (*)</translation>
     </message>
@@ -1513,37 +1051,34 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>Не знайдено жодного поштового клієнту</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <source>Ring account</source>
-        <comment>Default alias for new Ring account</comment>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
 <context>
-    <name>QualityDialog</name>
-    <message>
-        <location filename="../qualitydialog.ui" line="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>Авто</translation>
-    </message>
-</context>
-<context>
     <name>RingButton</name>
     <message>
         <location filename="../ringbutton.ui" line="140"/>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>Виклик на утриманні</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>Чат</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>Додати особу до виклику</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>Перенесення виклику</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>Відключити мікрофон</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>Якість</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>Приєднати виклики</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>Назва етикетки</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>Витрачено часу</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>Конфігурація</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>Відновлення виклику</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>Відключити відео</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>Поділитися частиною екрану</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>Поділитися екраном</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>Відправити файл</translation>
     </message>
@@ -1679,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1719,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1743,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation type="unfinished"/>
@@ -1784,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1810,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1854,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1899,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1967,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Генерація вашого облікового запису Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2029,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2089,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2164,8 +1627,37 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2248,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Генерація вашого облікового запису Ring...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2288,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2328,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

translations/ring_client_windows_zh.ts

diff --git a/translations/ring_client_windows_zh.ts b/translations/ring_client_windows_zh.ts
index ec09a6d..ba0477d 100644
--- a/translations/ring_client_windows_zh.ts
+++ b/translations/ring_client_windows_zh.ts
@@ -29,8 +29,8 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -87,9 +87,13 @@
         <translation>主機名稱</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>使用者名</translation>
     </message>
@@ -120,6 +124,11 @@
         <translation>UPnP 已啟動</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>允許未知來電</translation>
@@ -160,23 +169,12 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation type="unfinished"/>
     </message>
@@ -286,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring 帳號設定</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -317,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
@@ -587,8 +579,8 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -613,13 +605,13 @@
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -692,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>使用預設加密方式</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>暫停</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>選擇檔案</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>檔案(*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation type="unfinished"/>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -770,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>或是輸入號碼...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>傳送</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>從通訊錄尋找或是輸入ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>加到聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>想要與你談天！</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>接通</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>加到聯絡人</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>想要與你談天！</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>接通</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>透過Ring聯絡我</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>我的Ring ID是：</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation> </translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>通用</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>音訊/視訊</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>帳號</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>離開設定選單</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>歷史記錄設定</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>保留歷史紀錄(天)</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>清除歷史紀錄</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>個人檔案</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>姓名</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>儲存於:</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>自動檢查更新每</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>天</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>裝置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>解析度</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>輸出裝置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>輸入裝置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>加入新的帳號</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>輸出</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>啟動時執行</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>注册</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>選擇目錄</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>聯絡人已經存在</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>搜尋...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>建立新連絡人</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>新連絡人</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation type="unfinished"/>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>確定</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1425,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>設定</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1499,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>檔案(*)</translation>
     </message>
@@ -1512,33 +1051,30 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
 </context>
@@ -1551,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <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="../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="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation type="unfinished"/>
     </message>
@@ -1591,52 +1104,32 @@
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>麥克風靜音</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>品質</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>加入通話</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>經過時間</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>設定</translation>
     </message>
@@ -1646,7 +1139,7 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>視訊靜音</translation>
     </message>
@@ -1654,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>分享整個螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>分享部分螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>分享檔案</translation>
     </message>
@@ -1678,7 +1171,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1718,12 +1211,7 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1742,20 +1230,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>创建你的个人资料</translation>
@@ -1783,11 +1257,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1809,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1853,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1898,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1966,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ring 帳號產生中...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2028,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2088,20 +1566,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2163,8 +1627,37 @@
         <translation>创建你的账户</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <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>
+        <source>Register your username on the Jami. 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 ID.</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2247,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>Ring 帳號產生中...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2287,7 +1780,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
+        <source>Migrating your Jami account...</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -2327,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 f5f6c26..6cd8a3f 100644
--- a/translations/ring_client_windows_zh_CN.ts
+++ b/translations/ring_client_windows_zh_CN.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Ring的Microsoft Windows客户端。
-Ring是安全的、分布式的通讯软件。</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>主机名</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>用户名</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP已启用</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>允许未知来电</translation>
@@ -161,23 +169,12 @@
         <translation>公共用户名</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>在区块链上注册</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring帐户设置</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation type="unfinished"/>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>添加设备</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,14 +605,14 @@
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2641"/>
-        <source>Validate export on DHT for device linking button</source>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2644"/>
-        <source>Export on the Ring</source>
-        <translation>Ring导出</translation>
+        <location filename="../accountdetails.ui" line="2641"/>
+        <source>Validate export on DHT for device linking button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2696"/>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>使用默认加密算法</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>暂停</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>选择文件</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>文件 (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>正在生成您的PIN，请稍等。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>网络错误，请稍后重试。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>密码错误。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>正在注册…可能需要一些时间</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>或输入号码…</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>传输</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>查找通讯录或输入RingID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>会话</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami 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="769"/>
-        <source>Double-click to copy</source>
-        <translation>双击复制</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>创建二维码时产生错误</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>加入通讯录</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>想要与您通信！</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>应答</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>双击复制</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>创建二维码时产生错误</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>加入通讯录</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>想要与您通信！</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>应答</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>删除联系人</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>复制号码</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>在Ring上联系我</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>我的RingID是：</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>消息来自%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>来电：%1</translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>通用</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>音频/视频</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>帐户</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>退出设置菜单</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>历史记录设置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>历史记录保存天数</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>（设置为0则无限制）</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>清除历史记录</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>其他设置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>退出时保持窗口最小化</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>立即检查更新</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>帐户资料</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>姓名</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>录音设置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>保存至：</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>总是录制</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>启用通知</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>自动检查更新：每</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>天</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>通话时无法预览</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>设备选择</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>设备</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>分辨率</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>输出设备</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>输入设备</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>添加新帐户</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>导出</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>系统启动时运行Ring</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>新帐户</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>确定删除您的所有历史记录吗？</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>选择文件夹</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>已有联系人</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>搜索…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>创建新通讯录</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>新通讯录</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>在此处输入名称…</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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>收到的联系人请求</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="125"/>
-        <source>Accept contact request button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>接听</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>丢弃</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>屏蔽</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - 删除帐户</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>确定删除帐户“%s”吗？</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>该操作无法撤销</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>如果该帐户尚未导出或添加至另一设备，您将会丢失它</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>删除</translation>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>确定</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
+        <translation>设置</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
-        <translation>参数设置</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>退出</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>关于</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>选择文件</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>文件 (*)</translation>
     </message>
@@ -1513,35 +1051,32 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>未找到默认邮件客户端</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
         <translation type="unfinished"/>
     </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>自动</translation>
-    </message>
 </context>
 <context>
     <name>RingButton</name>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>表单</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>联系人ID</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>TODO: Explain the purpose of a contact request</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>发送联系人请求</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>通话等待中</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>将其他人加入通话</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>转接通话</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>将麦克风静音</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>质量</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>加入通话</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>名称标签</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>用时</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>参数设置</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>挂断</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>关闭视频</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>共享整个屏幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>共享屏幕区域</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>共享文件</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>正在迁移您的Ring帐户…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,15 +1211,10 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>创建Ring帐户</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="173"/>
         <source>Link this device to an account</source>
         <translation>将此设备与一个帐户进行连接</translation>
@@ -1743,29 +1230,6 @@
         <translation>欢迎来到</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;为了连接该设备到另一个账户，您首先 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;需要获取一个 PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;。 以下是获取 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;前往您之前使用的设备的 &lt;span style=&quot; font-weight:600;&quot;&gt;帐户管理设置&lt;/span&gt; &lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;选择您想使用的 &lt;span style=&quot; font-weight:600;&quot;&gt;Ring 帐户&lt;/span&gt; &lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;前往 &lt;span style=&quot; font-weight:600;&quot;&gt;设备&lt;/span&gt; 选项卡&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;选择 &lt;span style=&quot; font-weight:600;&quot;&gt;添加设备&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;这样您就会获得一个用来完成添加帐户的 PIN，该 PIN 在 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 分钟&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;内有效。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>创建您的帐户资料</translation>
@@ -1793,11 +1257,6 @@
         <translation>正在搜索…</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>在Ring上注册您的用户名。该用户名将由您独占。您的联系人将能够使用该用户名联系您，不必使用您的RingID。</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation type="unfinished"/>
@@ -1819,12 +1278,17 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
+        <source>Create Jami account button</source>
         <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
         <translation type="unfinished"/>
     </message>
     <message>
@@ -1863,6 +1327,20 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -1908,6 +1386,11 @@
         <translation type="unfinished"/>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation type="unfinished"/>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>正在生成您的Ring帐户…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation type="unfinished"/>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>创建Ring帐户</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation type="unfinished"/>
@@ -2098,29 +1566,6 @@
         <translation>如何添加设备</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;为了连接该设备到另一个账户，您首先 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;需要获取一个 PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;。 以下是获取 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;前往您之前使用的设备的 &lt;span style=&quot; font-weight:600;&quot;&gt;帐户管理设置&lt;/span&gt; &lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;选择您想使用的 &lt;span style=&quot; font-weight:600;&quot;&gt;Ring 帐户&lt;/span&gt; &lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;前往 &lt;span style=&quot; font-weight:600;&quot;&gt;设备&lt;/span&gt; 选项卡&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;选择 &lt;span style=&quot; font-weight:600;&quot;&gt;添加设备&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;这样您就会获得一个用来完成添加帐户的 PIN，该 PIN 在 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 分钟&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;内有效。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation type="unfinished"/>
@@ -2182,9 +1627,38 @@
         <translation>创建Ring帐户</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>在Ring上注册您的用户名。该用户名将由您独占。您的联系人将能够使用该用户名联系您，不必使用您的RingID。</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>正在生成您的Ring帐户…</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>正在迁移您的Ring帐户…</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,7 +1820,7 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
+        <source>Jami archive files (*.gz);; All files (*)</source>
         <translation type="unfinished"/>
     </message>
 </context>

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 e683aa8..e81ac2c 100644
--- a/translations/ring_client_windows_zh_TW.ts
+++ b/translations/ring_client_windows_zh_TW.ts
@@ -29,10 +29,9 @@
     </message>
     <message>
         <location filename="../aboutdialog.ui" line="563"/>
-        <source>The Microsoft Windows client for Ring.
-Ring is a secured and distributed communication software.</source>
-        <translation>Ring 的 Microsoft Windows 客戶端。
-RIng 是一個安全且分散式的通訊軟體。</translation>
+        <source>The Microsoft Windows client for Jami.
+Jami is a secured and distributed communication software.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../aboutdialog.cpp" line="32"/>
@@ -88,9 +87,13 @@
         <translation>主機名稱</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="350"/>
+        <source>Public registered username</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="426"/>
         <location filename="../accountdetails.ui" line="1754"/>
-        <location filename="../accountdetails.cpp" line="119"/>
         <source>Username</source>
         <translation>使用者名稱</translation>
     </message>
@@ -121,6 +124,11 @@
         <translation>UPnP 已啟用</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="832"/>
+        <source>Account Settings</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../accountdetails.ui" line="862"/>
         <source>Allow Call From Unknown</source>
         <translation>允許從未知對象的通話</translation>
@@ -161,23 +169,12 @@
         <translation>公開的使用者名稱</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="350"/>
-        <source>Ring public registered username</source>
-        <translation>Ring 公開註冊使用者名稱</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="369"/>
         <source>Register username on blockchain button</source>
         <translation>在區塊鏈按鈕上註冊使用者名稱</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="372"/>
-        <location filename="../accountdetails.cpp" line="110"/>
-        <location filename="../accountdetails.cpp" line="363"/>
-        <location filename="../accountdetails.cpp" line="380"/>
-        <location filename="../accountdetails.cpp" line="385"/>
-        <location filename="../accountdetails.cpp" line="390"/>
-        <location filename="../accountdetails.cpp" line="395"/>
         <source>Register on blockchain</source>
         <translation>在區塊鏈上註冊</translation>
     </message>
@@ -287,11 +284,6 @@
         <translation>正在變更密碼……</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="832"/>
-        <source>Ring Account Settings</source>
-        <translation>Ring 帳號設定</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="856"/>
         <source>Allow call from unknown checkbox</source>
         <translation>允許未知通話勾選框</translation>
@@ -318,7 +310,6 @@
     </message>
     <message>
         <location filename="../accountdetails.ui" line="958"/>
-        <location filename="../accountdetails.cpp" line="60"/>
         <source>Play</source>
         <translation>播放</translation>
     </message>
@@ -588,9 +579,9 @@
         <translation>新增裝置</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2565"/>
-        <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>
+        <location filename="../accountdetails.ui" line="2644"/>
+        <source>Export on the network</source>
+        <translation>在網路上匯出</translation>
     </message>
     <message>
         <location filename="../accountdetails.ui" line="2578"/>
@@ -614,16 +605,16 @@
         <translation>取消</translation>
     </message>
     <message>
+        <location filename="../accountdetails.ui" line="2565"/>
+        <source>To add a new device to your Jami account, you export your account on the network. 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="2641"/>
         <source>Validate export on DHT for device linking button</source>
         <translation>驗證供裝置連結在 DHT 上匯出按鈕</translation>
     </message>
     <message>
-        <location filename="../accountdetails.ui" line="2644"/>
-        <source>Export on the Ring</source>
-        <translation>在 Ring 上匯出</translation>
-    </message>
-    <message>
         <location filename="../accountdetails.ui" line="2696"/>
         <source>Your generated pin:</source>
         <translation>您的已生成 PIN 碼：</translation>
@@ -693,46 +684,6 @@
         <source>Use default ciphers</source>
         <translation>使用預設加密法</translation>
     </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="58"/>
-        <source>Pause</source>
-        <translation>暫停</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="105"/>
-        <source>RingID</source>
-        <translation>RingID</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="233"/>
-        <source>Choose File</source>
-        <translation>選擇檔案</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="235"/>
-        <source>Files (*)</source>
-        <translation>檔案 (*)</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="308"/>
-        <source>Please wait while your PIN is generated.</source>
-        <translation>請等待您的 PIN 碼生成。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="327"/>
-        <source>Network Error. Please try again later.</source>
-        <translation>網路錯誤。請稍後再試。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="331"/>
-        <source>Wrong password.</source>
-        <translation>錯誤的密碼。</translation>
-    </message>
-    <message>
-        <location filename="../accountdetails.cpp" line="358"/>
-        <source>Registering... It may take some time</source>
-        <translation>正在註冊... 這會耗費一些時間</translation>
-    </message>
 </context>
 <context>
     <name>AnimatedOverlay</name>
@@ -771,639 +722,226 @@
     </message>
 </context>
 <context>
-    <name>CallUtilsDialog</name>
-    <message>
-        <location filename="../callutilsdialog.ui" line="53"/>
-        <source>existing contacts list</source>
-        <translation>既存的聯絡人清單</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="68"/>
-        <source>contact transfer number text entry</source>
-        <translation>聯絡人轉接號碼文字項目</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="71"/>
-        <source>or type number...</source>
-        <translation>或輸入號碼...</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="110"/>
-        <source>Transfer call button</source>
-        <translation>轉接按鈕</translation>
-    </message>
-    <message>
-        <location filename="../callutilsdialog.ui" line="113"/>
-        <source>Transfer</source>
-        <translation>轉送</translation>
-    </message>
-</context>
-<context>
     <name>CallWidget</name>
     <message>
-        <location filename="../callwidget.ui" line="228"/>
-        <source>Search contacts or enter ring ID</source>
-        <translation>搜尋聯絡人或輸入 ring ID</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="293"/>
+        <location filename="../callwidget.ui" line="299"/>
         <source>Show conversations</source>
         <translation>顯示對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="296"/>
+        <location filename="../callwidget.ui" line="302"/>
         <source>Conversations</source>
         <translation>對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="509"/>
-        <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="219"/>
+        <location filename="../callwidget.ui" line="225"/>
         <source>Search contact text input</source>
         <translation>搜尋聯絡人文字輸入</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="660"/>
-        <source>Show ring ID QR code</source>
-        <translation>顯示 Ring ID 二維條碼</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="711"/>
-        <source>Share ring ID button</source>
-        <translation>分享 Ring ID 按鈕</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="769"/>
-        <source>Double-click to copy</source>
-        <translation>雙擊以複製</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="804"/>
-        <source>Error while generating QR Code</source>
-        <translation>產生 QR Code 時發生錯誤</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1023"/>
-        <location filename="../callwidget.ui" line="1273"/>
-        <source>best name</source>
+        <location filename="../callwidget.ui" line="234"/>
+        <source>Search contacts or enter ID</source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1047"/>
-        <source>best Id</source>
-        <translation type="unfinished"/>
+        <location filename="../callwidget.ui" line="585"/>
+        <source>Jami is free software for universal communication which respects the freedoms and privacy of its users.</source>
+        <translation>Jami 是一套通用通訊的自由軟體，其尊重使用者的自由與隱私。</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1558"/>
-        <source>Back to homepage button</source>
-        <translation>回到首頁按鈕</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1764"/>
-        <source>Add to contacts</source>
-        <translation>加到聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="306"/>
-        <source>Show invites</source>
-        <translation>顯示邀請</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="309"/>
-        <source>Invites</source>
-        <translation>邀請</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1283"/>
-        <source>Wants to talk to you!</source>
-        <translation>想要與您說說話！</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1356"/>
-        <source>Answer incoming call button</source>
-        <translation>答覆來電按鈕</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1428"/>
-        <source>Ignore incoming call button</source>
-        <translation>忽略來電按鈕</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="1378"/>
-        <source>Answer</source>
-        <translation>回覆</translation>
-    </message>
-    <message>
-        <location filename="../callwidget.ui" line="547"/>
+        <location filename="../callwidget.ui" line="625"/>
         <source>
- This is your RingID.
+ This is your ID.
 Copy and share it with your friends!
                                       </source>
         <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1456"/>
+        <location filename="../callwidget.ui" line="738"/>
+        <source>Show ring ID QR code</source>
+        <translation>顯示 Ring ID 二維條碼</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="789"/>
+        <source>Share ring ID button</source>
+        <translation>分享 Ring ID 按鈕</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="847"/>
+        <source>Double-click to copy</source>
+        <translation>雙擊以複製</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="888"/>
+        <source>Error while generating QR Code</source>
+        <translation>產生 QR Code 時發生錯誤</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1110"/>
+        <location filename="../callwidget.ui" line="1360"/>
+        <source>best name</source>
+        <translation>最佳名稱</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1134"/>
+        <source>best Id</source>
+        <translation>最佳 ID</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1645"/>
+        <source>Back to homepage button</source>
+        <translation>回到首頁按鈕</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1851"/>
+        <source>Add to contacts</source>
+        <translation>加到聯絡人</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="312"/>
+        <source>Show invites</source>
+        <translation>顯示邀請</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="315"/>
+        <source>Invites</source>
+        <translation>邀請</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1370"/>
+        <source>Wants to talk to you!</source>
+        <translation>想要與您說說話！</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1443"/>
+        <source>Answer incoming call button</source>
+        <translation>答覆來電按鈕</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1515"/>
+        <source>Ignore incoming call button</source>
+        <translation>忽略來電按鈕</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1465"/>
+        <source>Answer</source>
+        <translation>回覆</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.ui" line="1543"/>
         <source>Ignore</source>
         <translation>忽略</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1119"/>
+        <location filename="../callwidget.ui" line="1206"/>
         <source>Cancel outgoing call</source>
         <translation>取消去電</translation>
     </message>
     <message>
-        <location filename="../callwidget.ui" line="1144"/>
+        <location filename="../callwidget.ui" line="1231"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="256"/>
+        <location filename="../callwidget.cpp" line="264"/>
         <source>Start video call</source>
         <translation>開始視訊通話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="267"/>
+        <location filename="../callwidget.cpp" line="275"/>
         <source>Start audio call</source>
         <translation>開始音訊通話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="283"/>
+        <location filename="../callwidget.cpp" line="291"/>
         <source>Clear conversation</source>
         <translation>清除對話</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="290"/>
+        <location filename="../callwidget.cpp" line="298"/>
+        <source>Remove contact</source>
+        <translation>移除聯絡人</translation>
+    </message>
+    <message>
+        <location filename="../callwidget.cpp" line="305"/>
         <source>Block contact</source>
         <translation>阻擋連絡人</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="301"/>
+        <location filename="../callwidget.cpp" line="316"/>
         <source>Copy number</source>
         <translation>複製號碼</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>Contact me on Ring</source>
-        <translation>在 Ring 上聯絡我</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>Contact me on Jami</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="822"/>
-        <source>My RingId is : </source>
-        <translation>我的 RingId 是：</translation>
+        <location filename="../callwidget.cpp" line="844"/>
+        <source>My Id is : </source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="215"/>
+        <location filename="../callwidget.cpp" line="223"/>
         <source>Message incoming from %1</source>
         <translation>從 %1 來的訊息</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="739"/>
+        <location filename="../callwidget.cpp" line="755"/>
         <source>%1</source>
         <comment>%1 is the contact username</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="744"/>
+        <location filename="../callwidget.cpp" line="760"/>
         <source>%1</source>
         <comment>%1 is the contact unique identifier</comment>
         <translation>%1</translation>
     </message>
     <message>
-        <location filename="../callwidget.cpp" line="600"/>
+        <location filename="../callwidget.cpp" line="615"/>
         <source>Call incoming from %1</source>
         <translation>從 %1 的來電</translation>
     </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="97"/>
-        <source>General configuration tab</source>
-        <translation>一般設定分頁</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="103"/>
-        <source>General</source>
-        <translation>一般</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="119"/>
-        <source>Audio / Video configuration tab</source>
-        <translation>音訊／視訊設定分頁</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="122"/>
-        <source>Audio/Video</source>
-        <translation>音訊／視訊</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="138"/>
-        <source>Accounts configuration tab</source>
-        <translation>帳號設定分頁</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="141"/>
-        <source>Accounts</source>
-        <translation>帳號</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="180"/>
-        <source>quit settings menu</source>
-        <translation>退出設定選單</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="346"/>
-        <source>History Settings</source>
-        <translation>歷史記錄設定</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="387"/>
-        <source>Keep History for (days)</source>
-        <translation>保持歷史記錄數日</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="433"/>
-        <source>(Set to 0 for unlimited history)</source>
-        <translation>（設定為 0 以保留無限制的歷史紀錄）</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="490"/>
-        <source>Clear History</source>
-        <translation>清除歷史記錄</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="642"/>
-        <source>Misc. Settings</source>
-        <translation>其他設定</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="667"/>
-        <source>Keep minimized on close</source>
-        <translation>在關閉時保持最小化</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="820"/>
-        <source>Check for updates now</source>
-        <translation>現在檢查更新</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="258"/>
-        <source>Profile</source>
-        <translation>介紹</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="288"/>
-        <source>Avatar (click to change)</source>
-        <translation>大頭貼（點選以變更）</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="311"/>
-        <source>Display name text input</source>
-        <translation>顯示名稱文字輸入</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="314"/>
-        <source>Name</source>
-        <translation>名稱</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="400"/>
-        <source>Number of days of history kept</source>
-        <translation>保留幾天的歷史</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="484"/>
-        <source>clear history button</source>
-        <translation>清除歷史按鈕</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="527"/>
-        <source>Record Settings</source>
-        <translation>記錄設定</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="560"/>
-        <source>Save in :</source>
-        <translation>儲存在：</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="573"/>
-        <source>Call records path</source>
-        <translation>通話紀錄路徑</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="603"/>
-        <source>Always record calls checkbox</source>
-        <translation>總是記錄通話勾選框</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="609"/>
-        <source>Always Record</source>
-        <translation>總是記錄</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="661"/>
-        <source>keep minimized on close checkbox</source>
-        <translation>在關閉時最小化勾選框</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="679"/>
-        <source>enable notifications checkbox</source>
-        <translation>啟用通知勾選框</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="685"/>
-        <source>Enable notifications</source>
-        <translation>啟用通知</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="703"/>
-        <source>Launch ring on startup checkbox</source>
-        <translation>在開機時啟動 Ring 勾選框</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="732"/>
-        <source>Autamatic update checks checkbox</source>
-        <translation>自動檢查更新勾選框</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="738"/>
-        <source>Check for update automatically every</source>
-        <translation>自動檢查更新每</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="757"/>
-        <source>Interval between update checks in days selector</source>
-        <translation>檢查更新間隔（以天計）選擇器</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="778"/>
-        <source>days</source>
-        <translation>天</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="817"/>
-        <source>Check for updates now button</source>
-        <translation>立刻檢查更新按鈕</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="933"/>
-        <source>Preview unavailable during call</source>
-        <translation>在通話時預覽不可用</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="987"/>
-        <source>Device Selection</source>
-        <translation>裝置選擇</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1042"/>
-        <location filename="../configurationwidget.ui" line="1061"/>
-        <source>Video device selector</source>
-        <translation>視訊裝置選擇器</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1048"/>
-        <source>Device</source>
-        <translation>裝置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1082"/>
-        <source>Resolution</source>
-        <translation>解析度</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1095"/>
-        <source>Video device resolution selector</source>
-        <translation>視訊裝置解析度選擇器</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1122"/>
-        <source>Output Device</source>
-        <translation>輸出裝置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1129"/>
-        <source>Audio output device selector</source>
-        <translation>音訊輸出裝置選擇器</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1141"/>
-        <source>Input Device</source>
-        <translation>輸入裝置</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1148"/>
-        <source>Audio input device selector</source>
-        <translation>音訊輸入裝置選擇器</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1226"/>
-        <source>New account type selector</source>
-        <translation>新帳號類型選擇器</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1245"/>
-        <source>add new account</source>
-        <translation>加入新帳號</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1283"/>
-        <source>Delete account button</source>
-        <translation>刪除帳號按鈕</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1323"/>
-        <source>Export account button</source>
-        <translation>匯出帳號按鈕</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="1326"/>
-        <source>Export</source>
-        <translation>匯出</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.ui" line="712"/>
-        <source>Launch Ring on Startup</source>
-        <translation>開機時啟動 Ring</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="320"/>
-        <source>New Account</source>
-        <translation>新增帳號</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="340"/>
-        <source>Are you sure you want to clear all your history?</source>
-        <translation>您確定您要清除您所有的歷史？</translation>
-    </message>
-    <message>
-        <location filename="../configurationwidget.cpp" line="389"/>
-        <source>Choose Directory</source>
-        <translation>選擇資料夾</translation>
-    </message>
-</context>
-<context>
-    <name>ContactPicker</name>
-    <message>
-        <location filename="../contactpicker.ui" line="33"/>
-        <source>Existing Contact</source>
-        <translation>既有的聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="43"/>
-        <source>search existing contact text entry</source>
-        <translation>搜尋既有的聯絡人文字項目</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="46"/>
-        <source>Search...</source>
-        <translation>搜尋...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="56"/>
-        <source>existing contacts list</source>
-        <translation>既存的聯絡人清單</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="63"/>
-        <source>Create new contact button</source>
-        <translation>建立新聯絡人按鈕</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="66"/>
-        <source>Create new contact</source>
-        <translation>建立新聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="85"/>
-        <source>New Contact</source>
-        <translation>新聯絡人</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="108"/>
-        <source>New contact name text entry</source>
-        <translation>新聯絡人名稱文字項目</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="111"/>
-        <source>Enter a name here...</source>
-        <translation>在這裡輸入名稱...</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="141"/>
-        <source>Validate contact creation button</source>
-        <translation>驗證聯絡人建立按鈕</translation>
-    </message>
-    <message>
-        <location filename="../contactpicker.ui" line="144"/>
-        <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>進來的聯絡人請求</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="125"/>
-        <source>Accept contact request button</source>
-        <translation>接受聯絡人請求按鈕</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="132"/>
-        <source>Accept</source>
-        <translation>接聽</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="151"/>
-        <source>Mute contact request</source>
-        <translation>聯絡人靜音請求</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="158"/>
-        <source>Discard</source>
-        <translation>丟棄</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="177"/>
-        <source>Ban contact request</source>
-        <translation>阻擋聯絡人請求</translation>
-    </message>
-    <message>
-        <location filename="../contactrequestwidget.ui" line="184"/>
-        <source>Block</source>
-        <translation>阻擋</translation>
-    </message>
-</context>
-<context>
     <name>DeleteAccountDialog</name>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="14"/>
-        <source>Ring - account deletion</source>
-        <translation>Ring - 帳號刪除</translation>
+        <location filename="../deleteaccountdialog.ui" line="35"/>
+        <source>Account deletion</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="33"/>
-        <source>Do you really want to delete account ?</source>
-        <translation>您真的想要刪除帳號嗎？</translation>
+        <location filename="../deleteaccountdialog.ui" line="55"/>
+        <source>Do you really want to delete the following account?</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="66"/>
-        <source>This action is irrevocable</source>
-        <translation>此動作不可復原</translation>
+        <location filename="../deleteaccountdialog.ui" line="135"/>
+        <source>If this account hasn&apos;t been exported, or added to another device, it will be irrevocably lost.</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>若此帳號尚未匯出，或是新增到其他裝置，它&apos;將會遺失</translation>
+        <location filename="../deleteaccountdialog.ui" line="212"/>
+        <source>Permanently delete account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="138"/>
-        <source>Cancel contact deletion button</source>
-        <translation>取消聯絡人刪除按鈕</translation>
+        <location filename="../deleteaccountdialog.ui" line="218"/>
+        <source>Delete</source>
+        <translation>刪除</translation>
     </message>
     <message>
-        <location filename="../deleteaccountdialog.ui" line="141"/>
+        <location filename="../deleteaccountdialog.ui" line="250"/>
+        <source>Cancel account deletion</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../deleteaccountdialog.ui" line="256"/>
         <source>Cancel</source>
         <translation>取消</translation>
     </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="167"/>
-        <source>Validate contact deletion button</source>
-        <translation>驗證聯絡人刪除按鈕</translation>
-    </message>
-    <message>
-        <location filename="../deleteaccountdialog.ui" line="170"/>
-        <source>Ok</source>
-        <translation>確定</translation>
-    </message>
 </context>
 <context>
     <name>InviteButtonsWidget</name>
@@ -1426,25 +964,25 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../mainwindow.ui" line="435"/>
-        <source>Ring</source>
-        <translation>Ring</translation>
-    </message>
-    <message>
-        <location filename="../mainwindow.cpp" line="76"/>
-        <source>Configuration</source>
+        <location filename="../mainwindow.cpp" line="77"/>
+        <source>Settings</source>
         <translation>設定</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="79"/>
+        <location filename="../mainwindow.cpp" line="90"/>
         <source>Exit</source>
         <translation>離開</translation>
     </message>
     <message>
-        <location filename="../mainwindow.cpp" line="98"/>
+        <location filename="../mainwindow.cpp" line="110"/>
         <source>About</source>
         <translation>關於</translation>
     </message>
+    <message>
+        <location filename="../mainwindow.ui" line="435"/>
+        <source>Jami</source>
+        <translation type="unfinished"/>
+    </message>
 </context>
 <context>
     <name>PhotoBoothDialog</name>
@@ -1500,12 +1038,12 @@
 <context>
     <name>PrivateBridging</name>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Choose File</source>
         <translation>選擇檔案</translation>
     </message>
     <message>
-        <location filename="../messagewebview.cpp" line="331"/>
+        <location filename="../messagewebview.cpp" line="339"/>
         <source>Files (*)</source>
         <translation>檔案 (*)</translation>
     </message>
@@ -1513,34 +1051,31 @@
 <context>
     <name>QObject</name>
     <message>
-        <location filename="../utils.cpp" line="195"/>
+        <location filename="../utils.cpp" line="194"/>
         <source>No default mail client found</source>
         <translation>找不到預設的電子郵件客戶端</translation>
     </message>
     <message>
+        <location filename="../settingsitemwidget.cpp" line="68"/>
+        <source>Edit Device Name</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="74"/>
+        <source>Unlink Device From Account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../settingsitemwidget.cpp" line="90"/>
+        <source>Unblock Contact</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.cpp" line="37"/>
         <location filename="../wizardwidget.cpp" line="37"/>
-        <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="64"/>
-        <source>Quality slider</source>
-        <translation>品質滑桿</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="103"/>
-        <source>Automatic quality checkbox</source>
-        <translation>自動品質勾選框</translation>
-    </message>
-    <message>
-        <location filename="../qualitydialog.ui" line="106"/>
-        <source>Auto</source>
-        <translation>自動</translation>
+        <source>Jami account</source>
+        <comment>Default alias for new Jami account</comment>
+        <translation type="unfinished"/>
     </message>
 </context>
 <context>
@@ -1552,32 +1087,9 @@
     </message>
 </context>
 <context>
-    <name>SendContactRequestWidget</name>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="14"/>
-        <source>Form</source>
-        <translation>表單</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="26"/>
-        <source>ContactID</source>
-        <translation>聯絡人 ID</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="39"/>
-        <source>TODO: Explain the purpose of a contact request</source>
-        <translation>待辦：解釋聯絡人請求的目的</translation>
-    </message>
-    <message>
-        <location filename="../sendcontactrequestwidget.ui" line="78"/>
-        <source>Send contact request</source>
-        <translation>傳送聯絡人請求</translation>
-    </message>
-</context>
-<context>
     <name>VideoOverlay</name>
     <message>
-        <location filename="../videooverlay.ui" line="557"/>
+        <location filename="../videooverlay.ui" line="429"/>
         <source>Call on Hold</source>
         <translation>保留中的通話</translation>
     </message>
@@ -1592,52 +1104,32 @@
         <translation>聊天</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="156"/>
-        <source>Add person to call</source>
-        <translation>新增人物到通話</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="188"/>
-        <source>Transfer call</source>
-        <translation>轉送通話</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="226"/>
+        <location filename="../videooverlay.ui" line="162"/>
         <source>Mute Mic</source>
         <translation>麥克風靜音</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="308"/>
+        <location filename="../videooverlay.ui" line="244"/>
         <source>Record call</source>
         <translation>記錄通話</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="340"/>
-        <source>Quality</source>
-        <translation>品質</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="372"/>
-        <source>Join Calls</source>
-        <translation>加入通話</translation>
-    </message>
-    <message>
-        <location filename="../videooverlay.ui" line="448"/>
+        <location filename="../videooverlay.ui" line="320"/>
         <source>Name label</source>
         <translation>名稱標籤</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="508"/>
+        <location filename="../videooverlay.ui" line="380"/>
         <source>Time elapsed</source>
         <translation>時間流逝</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="511"/>
+        <location filename="../videooverlay.ui" line="383"/>
         <source>00:00</source>
         <translation>00:00</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="524"/>
+        <location filename="../videooverlay.ui" line="396"/>
         <source>Configuration</source>
         <translation>設定</translation>
     </message>
@@ -1647,7 +1139,7 @@
         <translation>掛斷</translation>
     </message>
     <message>
-        <location filename="../videooverlay.ui" line="267"/>
+        <location filename="../videooverlay.ui" line="203"/>
         <source>Mute Video</source>
         <translation>視訊靜音</translation>
     </message>
@@ -1655,17 +1147,17 @@
 <context>
     <name>VideoView</name>
     <message>
-        <location filename="../videoview.cpp" line="280"/>
+        <location filename="../videoview.cpp" line="275"/>
         <source>Share entire screen</source>
         <translation>分享整個螢幕</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="283"/>
+        <location filename="../videoview.cpp" line="278"/>
         <source>Share screen area</source>
         <translation>分享螢幕區域</translation>
     </message>
     <message>
-        <location filename="../videoview.cpp" line="290"/>
+        <location filename="../videoview.cpp" line="285"/>
         <source>Share file</source>
         <translation>分享檔案</translation>
     </message>
@@ -1679,8 +1171,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>正在遷移您的 Ring 帳號...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="99"/>
@@ -1719,13 +1211,8 @@
     </message>
     <message>
         <location filename="../wizarddialog.cpp" line="351"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring 封存檔 (*.gz);; 所有檔案 (*)</translation>
-    </message>
-    <message>
-        <location filename="../wizarddialog.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>建立 Ring 帳號</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="173"/>
@@ -1743,29 +1230,6 @@
         <translation>歡迎來到</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;要連結此裝置到其他帳號，首先您&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;需要取得 PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; 碼。要生成 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;到&lt;span style=&quot; font-weight:600;&quot;&gt;帳號管理設定頁面&lt;/span&gt;在前一臺裝置&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;選擇您想要使用的 &lt;span style=&quot; font-weight:600;&quot;&gt;Ring 帳號&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;到&lt;span style=&quot; font-weight:600;&quot;&gt;裝置&lt;/span&gt;分頁&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;選取&lt;span style=&quot; font-weight:600;&quot;&gt;新增裝置&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;您將會得到必要的 PIN 碼以完成此表單。PIN 碼僅在 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 分鐘&lt;/span&gt;內有效&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="450"/>
         <source>Create your profile</source>
         <translation>建立您的檔案</translation>
@@ -1793,11 +1257,6 @@
         <translation>正在搜尋...</translation>
     </message>
     <message>
-        <location filename="../wizarddialog.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>在 Ring 上註冊您的使用者名稱。這將會保留使用者名稱，只有您可以使用它。您的朋友將可以使用您的使用者名稱來與您通話，而不用使用您的 RingID。</translation>
-    </message>
-    <message>
         <location filename="../wizarddialog.ui" line="33"/>
         <source>Wizard Dialog</source>
         <translation>精靈視窗</translation>
@@ -1819,13 +1278,18 @@
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>建立 Ring 帳號按鈕</translation>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Ring 帳號建立開始觸發請按下按鈕</translation>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizarddialog.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="164"/>
@@ -1863,6 +1327,20 @@
         <translation>從檔案連結帳號</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="357"/>
         <source>Select file to import</source>
         <translation>選取要匯入的檔案</translation>
@@ -1908,6 +1386,11 @@
         <translation>完整名稱輸入的文字項目</translation>
     </message>
     <message>
+        <location filename="../wizarddialog.ui" line="670"/>
+        <source>Register your username on the network. 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 ID.</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizarddialog.ui" line="673"/>
         <source>Public username checkbox</source>
         <translation>公開使用者名稱勾選框</translation>
@@ -1976,8 +1459,8 @@
     <message>
         <location filename="../wizarddialog.ui" line="933"/>
         <location filename="../wizarddialog.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>正在生成您的 Ring 帳號...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizarddialog.ui" line="969"/>
@@ -2038,21 +1521,6 @@
         <translation>歡迎圖示</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="139"/>
-        <source>Create Ring account button</source>
-        <translation>建立 Ring 帳號按鈕</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="145"/>
-        <source>Push button for Ring account creation start trigger</source>
-        <translation>Ring 帳號建立開始觸發請按下按鈕</translation>
-    </message>
-    <message>
-        <location filename="../wizardwidget.ui" line="151"/>
-        <source>Create Ring account</source>
-        <translation>建立 Ring 帳號</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="164"/>
         <source>Link device button</source>
         <translation>連結裝置按鈕</translation>
@@ -2098,29 +1566,6 @@
         <translation>如何新增裝置</translation>
     </message>
     <message>
-        <location filename="../wizardwidget.ui" line="329"/>
-        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
-&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
-p, li { white-space: pre-wrap; }
-&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
-&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Ring account&lt;/span&gt; you want to use&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
-&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
-        <translation>&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;Cantarell&apos;; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;要連結此裝置到其他帳號，首先您&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;需要取得 PIN&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt; 碼。要生成 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-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;到&lt;span style=&quot; font-weight:600;&quot;&gt;帳號管理設定頁面&lt;/span&gt;在前一臺裝置&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;選擇您想要使用的 &lt;span style=&quot; font-weight:600;&quot;&gt;Ring 帳號&lt;/span&gt;&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;到&lt;span style=&quot; font-weight:600;&quot;&gt;裝置&lt;/span&gt;分頁&lt;/li&gt;
-&lt;li style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;選取&lt;span style=&quot; font-weight:600;&quot;&gt;新增裝置&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
-&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;您將會得到必要的 PIN 碼以完成此表單。PIN 碼僅在 &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 分鐘&lt;/span&gt;內有效&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;。&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</translation>
-    </message>
-    <message>
         <location filename="../wizardwidget.ui" line="357"/>
         <source>Select file to import</source>
         <translation>選取要匯入的檔案</translation>
@@ -2182,9 +1627,38 @@
         <translation>建立您的帳號</translation>
     </message>
     <message>
+        <location filename="../wizardwidget.ui" line="139"/>
+        <source>Create Jami account button</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="145"/>
+        <source>Push button for Jami account creation start trigger</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="151"/>
+        <source>Create Jami account</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
+        <location filename="../wizardwidget.ui" line="329"/>
+        <source>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+p, li { white-space: pre-wrap; }
+&lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Cantarell'; font-size:11pt; font-weight:400; font-style:normal;&quot;&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt;To link this device to another account, you first &lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt; font-weight:600;&quot;&gt;need to obtain a PIN&lt;/span&gt;&lt;span style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot;&gt; code. To generate the PIN code:&lt;/span&gt;&lt;/p&gt;
+&lt;ol style=&quot;margin-top: 0px; margin-bottom: 0px; margin-left: 0px; margin-right: 0px; -qt-list-indent: 1;&quot;&gt;&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:12px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Account management setting&lt;/span&gt; of a previous device&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Choose the &lt;span style=&quot; font-weight:600;&quot;&gt;Jami account&lt;/span&gt; you want to use&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Go to the &lt;span style=&quot; font-weight:600;&quot;&gt;Devices&lt;/span&gt; tab&lt;/li&gt;
+&lt;li style=&quot; font-family:'Ubuntu'; font-size:12pt;&quot; style=&quot; margin-top:0px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;Select &lt;span style=&quot; font-weight:600;&quot;&gt;Add a device&lt;/span&gt;&lt;/li&gt;&lt;/ol&gt;
+&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;You will get the necessary PIN to complete this form. The PIN is only valid for &lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt; font-weight:600;&quot;&gt;10 minutes&lt;/span&gt;&lt;span style=&quot; font-family:&apos;Ubuntu&apos;; font-size:12pt;&quot;&gt;.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</source>
+        <translation type="unfinished"/>
+    </message>
+    <message>
         <location filename="../wizardwidget.ui" line="670"/>
-        <source>Register your username on the Ring. This will reserve the username so that only you can use it. Your friends will be able to call you with your usename instead of using your RingID.</source>
-        <translation>在 Ring 上註冊您的使用者名稱。這將會保留使用者名稱，只有您可以使用它。您的朋友將可以使用您的使用者名稱來與您通話，而不用使用您的 RingID。</translation>
+        <source>Register your username on the Jami. 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 ID.</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="673"/>
@@ -2266,8 +1740,8 @@
     <message>
         <location filename="../wizardwidget.ui" line="933"/>
         <location filename="../wizardwidget.cpp" line="101"/>
-        <source>Generating your Ring account...</source>
-        <translation>正在生成您的 Ring 帳號...</translation>
+        <source>Generating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.ui" line="969"/>
@@ -2306,8 +1780,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="97"/>
-        <source>Migrating your Ring account...</source>
-        <translation>正在遷移您的 Ring 帳號...</translation>
+        <source>Migrating your Jami account...</source>
+        <translation type="unfinished"/>
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="99"/>
@@ -2346,8 +1820,8 @@
     </message>
     <message>
         <location filename="../wizardwidget.cpp" line="339"/>
-        <source>Ring archive files (*.gz);; All files (*)</source>
-        <translation>Ring 封存檔 (*.gz);; 所有檔案 (*)</translation>
+        <source>Jami archive files (*.gz);; All files (*)</source>
+        <translation type="unfinished"/>
     </message>
 </context>
 </TS>
\ No newline at end of file