diff --git a/po/ar.po b/po/ar.po
index 7518985e5c79a64ac95ee44a259565faba211ec2..65a8735be02b2e0fa5b429271bb3ffff97b41068 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Arabic (http://www.transifex.com/savoirfairelinux/ring/language/ar/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -151,11 +151,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "ألغِ"
 
@@ -176,7 +176,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -217,7 +217,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "موافق"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "فتح Ring عند تسجيل الدخول"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "أحضر Ring إلى الأمام عند تلقي مكالمة"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "عام"
 msgid "Media"
 msgstr "ميديا"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "إعدادات"
 
@@ -409,8 +409,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -468,7 +468,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -735,18 +735,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "حفظ الملف"
 
@@ -849,13 +849,13 @@ msgstr "حفظ الملف"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr "اكشف كلمة السر"
 msgid "Voicemail number"
 msgstr "رقم البريد الصوتي"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -949,8 +949,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -965,64 +965,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "إبحث عن إتصالات أو أدخل رقم"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "مكالمة واردة"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "إستعداد الحالة المخفية للنافذة الرئيسية (تنطبق فقط على النموذج الأول)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- وسيط GNOME إلى Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "هاذا معرفك RingI\nانسخه و بثه لأصدقائك!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "آلي"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/bg.po b/po/bg.po
index e4a455dccba54e784763279f355cf93590519de0..cacc74c93a2cc0932f6ae9d8855b9fd55b4d9a94 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Bulgarian (http://www.transifex.com/savoirfairelinux/ring/language/bg/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Създай Ring акаунт"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -151,11 +151,11 @@ msgid "Link this device to an account"
 msgstr "Свързване на това устройство с акаунт"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Отказ"
 
@@ -176,7 +176,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -217,7 +217,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Потвърдете паролата"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr "Може да отнеме известно време."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "Добре"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Настройки на Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Пускане на Ring при влизане"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Извеждане на Ring на преден план при входящо обаждане."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "Общи"
 msgid "Media"
 msgstr "Звук и видео"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Настройки"
 
@@ -409,10 +409,10 @@ msgstr "Добавяне на ново устройство"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "За да добавите ново устройство в своя акаунт в Ring, трябва да изнесете акаунта си в Ring. Това ще Ви даде ПИН-код, който трябва да бъде въведен на новото устройство в рамките на 5 минути от създаването си."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr "Вкарай архивна парола"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -468,8 +468,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Познати устройства свързани с този акаунт в Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -735,18 +735,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Откажи"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Грешна парола"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Мрежова грешка, опитай отново"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Запазване на файла"
 
@@ -849,13 +849,13 @@ msgstr "Запазване на файла"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr "Показване на паролата"
 msgid "Voicemail number"
 msgstr "Номер на гласова поща"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Покажи разширена информация"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Отваряне"
 
@@ -949,8 +949,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -965,64 +965,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "започване на разговор"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "отваряне на чата"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Потърсете контакти или въведете номер"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Входящо обаждане"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "Възстановява скритото състояние на основния прозорец (това е приложимо само за първоначално изпълнената програма)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "— Клиент на Ring за ГНОМ"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Паролите не съвпадат"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Това е Вашият идентификатор за Ring.\nКопирайте го и го споделете с приятелите си!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring е безплатен софтуер за универсална комуникация, който уважава свободата и личните данни на потребителите си."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авт."
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Нова парола"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Извън линия"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "На линия"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 1d00d2b2cb2a16a03ec5c4918d0e838677c9b5bd..ff662e0fb70887f7c3fcbe52c9be614a2d8b283d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Catalan (http://www.transifex.com/savoirfairelinux/ring/language/ca/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -141,23 +141,23 @@ msgid "Welcome to"
 msgstr "Benvingut a"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Crear compte de Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Crear un compte de Ring (per usuaris nous)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Enllaça aquest dispositiu a un compte"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Enllaça aquest dispositiu a un compte de Ring creat a un altre dispositiu"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Cancel·la"
 
@@ -178,7 +178,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -219,7 +219,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -236,12 +236,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -253,7 +253,7 @@ msgid "This may take a few minutes."
 msgstr "Això pot trigar uns minuts."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -266,20 +266,20 @@ msgid "OK"
 msgstr "D'acord"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Configuració de Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Obre Ring a l'inici"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Mostrar Ring a l'àrea de notificació del sistema (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Torna Ring al primer pla amb les trucades entrants."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -341,7 +341,7 @@ msgstr "General"
 msgid "Media"
 msgstr "Mitjans"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Opcions"
 
@@ -411,8 +411,8 @@ msgstr "Afegir nou dispositiu"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -425,11 +425,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -444,7 +444,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -470,8 +470,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Dispositius coneguts enllaçats a aquest compte de Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -737,18 +737,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Error de Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -796,7 +796,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -814,36 +814,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancel·la"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Mala contrasenya"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Error de xarxa, proveu de nou"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "No s'ha pogut iniciar la exportació a Ring, proveu de nou"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -851,13 +851,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -877,11 +877,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Revoca el dispositiu"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -905,35 +905,35 @@ msgstr "Mostra la contrasenya"
 msgid "Voicemail number"
 msgstr "Nombre de correu de veu"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Mostra informació avançada"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Obre"
 
@@ -951,9 +951,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "El client de GNOME per a Ring\nEl Ring és un programari per a comunicacions universals que respecta la llibertat i privacitat dels seus usuaris"
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -967,64 +967,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fer una trucada"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "obrir un xat"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Busqueu contactes o introduïu el nombre"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Trucada entrant"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Error de Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1078,116 +1078,110 @@ msgid ""
 msgstr "Restaura l'estat ocult de la finestra principal (només s'aplica a la instància principal)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Client de GNOME per a Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "No coincideixen les contrasenyes"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Aquest és el vostre nom d'usuari de Ring.\nCopieu i compartiu amb les vostres amistats!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Aquest és el vostre RingID.\nCopieu i compartiu amb les vostres amistats!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "El Ring és un programari per a comunicacions universals que respecta la llibertat i privacitat dels seus usuaris"
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nova contrasenya"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/cs_CZ.po b/po/cs_CZ.po
index b27c61bd85b65fea13bd40ba9fd6595c8011182a..dd8a20a43879da743f60d3e2689eda7847e9b273 100644
--- a/po/cs_CZ.po
+++ b/po/cs_CZ.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/savoirfairelinux/ring/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Převést účet"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -140,23 +140,23 @@ msgid "Welcome to"
 msgstr "Vítejte v"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Vytvořit účet Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Vytvořit nový Ring účet (pro nové uživatele)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Připojit toto zařízení k účtu"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Propojit toto zařízení s účtem, který byl vytvořen na jiném zařízení"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Zrušit"
 
@@ -177,7 +177,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -218,10 +218,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Zaškrtnutím tohoto nastavení si zaregistrujete jedinečné uživatelské jméno na síti Ring. Ostatní ho budou moci použít k navázání spojení, namísto obvyklého RingID, které je 40 znaků dlouhé."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -235,12 +235,12 @@ msgid ""
 "devices to your account."
 msgstr "Toto heslo bude použito k zašifrování dat vašeho účtu a pro připojování nových zařízení k účtu."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Potvrdit heslo"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -252,7 +252,7 @@ msgid "This may take a few minutes."
 msgstr "Toto může pár minut trvat."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -265,20 +265,20 @@ msgid "OK"
 msgstr "Budiž"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Nastavení Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Spouštět Ring po přihlášení"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Ukázat ikonu Ring v oznamovací oblasti (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Při příchozích hovorech přenést okno Ring do popředí."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -340,7 +340,7 @@ msgstr "Obecné"
 msgid "Media"
 msgstr "Média"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Nastavení"
 
@@ -410,10 +410,10 @@ msgstr "Přidat nové zařízení"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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í."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -424,11 +424,11 @@ msgid "Enter archive password"
 msgstr "Vložte heslo archivu"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Exportovat na Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -443,7 +443,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -469,8 +469,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Známá zařízení připojená k tomuto účtu Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -736,18 +736,18 @@ msgstr "Nastavit výběr jako obrázek"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Chyba Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -795,7 +795,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -813,36 +813,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Zrušit"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Nesprávné heslo"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Chyba v síti, zkuste to znovu"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Nepodařilo se začít export do Ringu, zkuste to znovu"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Uložit soubor"
 
@@ -850,13 +850,13 @@ msgstr "Uložit soubor"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -876,11 +876,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Odebrat zařízení"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -904,35 +904,35 @@ msgstr "Ukázat heslo"
 msgid "Voicemail number"
 msgstr "Číslo hlasové schránky"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Ukázat pokročilé informace"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Otevřít profilový obrázek"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Otevřít"
 
@@ -950,9 +950,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Klient Ring pro GNOME.\nRing je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -966,65 +966,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "zavolat"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "otevřít zprávy"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Hledat kontakty nebo zadat číslo"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Příchozí hovor"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Chyba Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Nelze se znovu připojit k démonu Ring (dring).\nRing nyní bude ukončen."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1077,116 +1077,110 @@ msgid ""
 msgstr "Obnoví skrytý stav hlavního okna (platí pouze pro primární instanci)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Klient GNOME pro Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Hesla se neshodují"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Toto je vaše uživatelské jméno pro Ring.\nZkopírujte a sdílejte jej s vašimi přáteli!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Toto je vaše RingID.\nKopírujte a sdílejte jej s přáteli!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring je svobodný software určený k univerzální komunikaci, který respektuje svobody a práva uživatelů."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automaticky"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nové heslo"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Nepřipojen"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Připojen"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/da.po b/po/da.po
index 5746c26a1202ddebf486b4ef1239fe0c8e2d86fb..cec3b9c4b834bf24d1b4bea46311b8200271a916 100644
--- a/po/da.po
+++ b/po/da.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Danish (http://www.transifex.com/savoirfairelinux/ring/language/da/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Migrér konto"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Slet konto"
 
@@ -140,23 +140,23 @@ msgid "Welcome to"
 msgstr "Velkommen til "
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Opret Ring-konto"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Opret en ny Ring-konto (til nye brugere)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Tilknyt denne enhed til en konto"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Tilknyt denne enhed til en Ring-konto oprettet på en anden enhed"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Annuller"
 
@@ -177,11 +177,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Du har to muligheder for at tilknytte denne enhed til en anden konto . Du kan importere kontoen fra DHT, men før du kan det skal du generere en PIN-kode. For at gøre dette, skal du gå ind i konto-indstillinger på den enhed hvor kontoen befinder sig, vælge Ring-kontoen og trykke \"Tilknyt en anden enhed til denne konto\". Du vil nu se den PIN-kode du skal indtaste i formular nedenfor på denne enhed. Koden er kun gyldig i 10 minutter. Alternativt, kan du importere kontoen direkte fra et arkiv. "
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -218,10 +218,10 @@ msgstr "Registrer brugernavn"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Ved at markere denne, får du mulighed for at registrere et unikt brugernavn på Ring-netværket. Andre brugere kan vil så kunne kontakte dig via dette, i stedet for dit RingID, som er 40 tegn langt."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -235,13 +235,13 @@ msgid ""
 "devices to your account."
 msgstr "Denne adgangskode vil blive brugt til at kryptere din kontos data og til at tilknytte nye enheder til din konto."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Bekræft adgangskode"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Genererer din Ring-konto…"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -252,8 +252,8 @@ msgid "This may take a few minutes."
 msgstr "Dette kan tage nogle minutter."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Indhenter din Ring-konto…"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -265,20 +265,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring-indstillinger"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Start Ring ved login"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Vis Ring-ikon i notifikationsområdet (systray)"
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Hæv Ring til forgrunden ved indgående opkald."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -340,7 +340,7 @@ msgstr "Generelt"
 msgid "Media"
 msgstr "Medier"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Indstillinger"
 
@@ -410,10 +410,10 @@ msgstr "Tilføj ny enhed"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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,"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -424,12 +424,12 @@ msgid "Enter archive password"
 msgstr "Indtast arkivets adgangskode"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Eksporter til Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Eksporterer konto på Ring…"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -443,7 +443,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Klik for at skifte adgangskode"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Eksporter konto"
 
@@ -469,8 +469,8 @@ msgid "Voicemail"
 msgstr "Telefonsvarer"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Kendte enheder som er tilknyttet denne Ring-konto"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -736,19 +736,19 @@ msgstr "Sæt markerede som billede"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Kan ikke initialisere.\nSikr dig at Ring-daemon (dring) kører.\nFejl: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring-fejl"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Vis Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -795,8 +795,8 @@ msgid "Performing lookup…"
 msgstr "Udfører opslag…"
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Indtast adgangskoden til din Ring-konto"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -813,36 +813,36 @@ msgid "Choose download folder"
 msgstr "Vælg downloadmappe"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuller"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Gem"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Forkert adgangskode"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Netværksfejl, prøv igen"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Kunne ikke starte Ring-eksport, prøv igen"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Skift adgangskode"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Gem fil"
 
@@ -850,13 +850,13 @@ msgstr "Gem fil"
 msgid "File exported to destination: "
 msgstr "Fil eksporteret til destination:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Advarsel! Handlingen vil tilbagetrække enheden!\nBemærk: handlingen kan ikke fortrydes."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Indtast adgangskode for at tilbagetrække enhed"
 
@@ -876,11 +876,11 @@ msgstr "Forkert adgangskode"
 msgid "Save name"
 msgstr "Gem navn"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Tilbagetræk enheden"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Fejl under tilbagetrækning af enhed"
 
@@ -904,35 +904,35 @@ msgstr "Vis adgangskode"
 msgid "Voicemail number"
 msgstr "Telefonsvarernummer"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Fejl: forkert adgangskode!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Fejl: ukendt enhed!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Del _skærmområde"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Del _monitor"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Stream _fil"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Vis udvidet information"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Åbn profilbillede"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Åbn"
 
@@ -950,9 +950,9 @@ msgstr "\"Live Free or Die\"\nbygget %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "GNOME-klienten til Ring.\nRing er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -966,65 +966,65 @@ msgstr "Stop optagelse"
 msgid "Send recorded message"
 msgstr "Send optagede meddelelse"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Tilføj konto…"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "foretag opkald"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "åbn chat"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Søg efter kontakt eller indtast nummer"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Forlad indstillingsside"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr " kalder dig!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Indgående opkald"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Ny anmodning fra "
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Hav tillid til anmodning"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Ny besked"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring-fejl"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Prøver at genoprette forbindelse til Ring-dæmonen (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Kunne ikke forbinde til Ring-daemon igen (dring).\nRing afsluttes nu."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1077,116 +1077,110 @@ msgid ""
 msgstr "Gendanner den skjulte tilstand fort hovedvinduer (kun gyldig for den primære instans)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME-klient til Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Adgangskoderne er ikke ens"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Her er dit Ring-brugernavn.\nKopiér og del med dine venner!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Her er dit RingID.\nKopiér og del det med dine venner!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring er fri software til universel kommunikation som respekterer sine brugeres frihed og privatliv."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "QR-kode for RingID"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Advarsel! Handlingen vil fjerne kontoen på enheden!\nBemærk: handlingen kan ikke fortrydes. Desuden kan dit registrerede navn gå tabt!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Rediger navn"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Fjern blokering"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Ny adgangskode og dens bekræftelse er forskellige!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Forkert adgangskode!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Bemærk: dette vil kun ændre adgangskoden på denne enhed."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Nuværende adgangskode"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Ny adgangskode"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Konto eksporteret!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Eksport af konto mislykkedes."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Ukendt fejl"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Initialiserer..."
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Ingen forbindelse"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Opretter forbindelse…"
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Forbundet"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Ukendt status"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "der er ikke indstillet nogen adgangskode"
diff --git a/po/de.po b/po/de.po
index 233f69d913cc29c0b306b3c28dd89fa58aef6267..8907ad94a0ac09e0458be3a267f1636bdf853dbc 100644
--- a/po/de.po
+++ b/po/de.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: German (http://www.transifex.com/savoirfairelinux/ring/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr "Konto migrieren"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Konto löschen"
 
@@ -151,23 +151,23 @@ msgid "Welcome to"
 msgstr "Willkommen bei"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Ring-Konto erstellen"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Neues Ring-Konto (für neue Benutzer) erstellen"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Dieses Gerät mit einem Konto verknüpfen"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Verbinde dieses Gerät mit einem Konto, dass auf einem anderen Gerät erzeugt wurde."
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -188,11 +188,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Um dieses Gerät mit einem anderen Konto zu verbinden gibt es zwei Möglichkeiten. Sie können das Konto von DHT importieren, dafür brauch es einen PIN-Code. Um den PIN-Code zu generieren, wechseln Sie zur Kontoverwaltung eines bereits vernüpften Geräts, wählen das zu verwendende Ring Konto aus und wählen \"Ein anderes Gerät mit diesem Konto verknüpfen\". Sie erhalten die erforderliche PIN. Die PIN ist nur für 10 Minuten gültig. Oder Sie können Ihr Konto direkt aus einem Archiv importieren."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -229,10 +229,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Wenn Sie dies anklicken, melden Sie einen einzigartigen Benutzername auf dem Ring-Netzwerk an. Damit können andere Leute Sie kontaktieren und brauchen nicht Ihre 40 Zeichen lange Ring-ID."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -246,12 +246,12 @@ msgid ""
 "devices to your account."
 msgstr "Mit diesem Passwort werden Ihre Kontodaten geschützt und Sie können neue Geräte mit Ihrem Konto verknüpfen."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Passwort bestätigen"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -263,7 +263,7 @@ msgid "This may take a few minutes."
 msgstr "Das kann ein paar Minuten dauern."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -276,20 +276,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring Einstellungen"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Ring beim Anmelden starten"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Das Ring-Icon im Benachrichtigungsfeld (systray) anzeigen"
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Bei eingehenden Anrufen Ring in den Vordergrund bringen."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -351,7 +351,7 @@ msgstr "Allgemein"
 msgid "Media"
 msgstr "Medium"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -421,10 +421,10 @@ msgstr "Neues Gerät hinzufügen"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -435,11 +435,11 @@ msgid "Enter archive password"
 msgstr "Passwort für das Archiv eingeben"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Zu Ring exportieren"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -454,7 +454,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Konten exportieren"
 
@@ -480,8 +480,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Bekannte Geräte, die mit diesem Ring-Konto verknüpft sind"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -747,19 +747,19 @@ msgstr "Auswahl als Bild benutzen"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Initialisierung fehlgeschlagen.\nGehen Sie sicher, dass der Ring Daemon (dring) läuft.\nFehler: %s "
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring Fehler"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Ring anzeigen"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -806,7 +806,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -824,36 +824,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Abbrechen"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Unsicheres Passwort"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Netzwerkfehler, bitte nochmal versuchen"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Konnten den Export zu Ring nicht starten, bitte erneut versuchen"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Passwort ändern"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Datei speichern"
 
@@ -861,13 +861,13 @@ msgstr "Datei speichern"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -887,11 +887,11 @@ msgstr "Falsches Passwort"
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Gerät widerrufen"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -915,35 +915,35 @@ msgstr "Passwort anzeigen"
 msgid "Voicemail number"
 msgstr "Nummer des Anrufbeantworters"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Erweiterte Informationen anzeigen"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Profilbild öffnen"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Öffnen"
 
@@ -961,9 +961,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Die GNOME-Oberfläche für Ring.\nRing ist eine Freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -977,65 +977,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Anrufen"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Chat öffnen"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Kontakte suchen oder Nummer eingeben"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring Fehler"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Die Verbindung zum Ring-Hintergrunddienst (dring) konnte nicht wieder hergestellt werden.\nRing wird jetzt beendet."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1088,116 +1088,110 @@ msgid ""
 msgstr "Stellt den versteckten Zustand des Hauptfensters wieder her (nur für die Hauptinstanz möglich)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME-Oberfläche für Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Dies ist Ihr Ring-Benutzername.\nTeilen Sie ihn mit Ihren Freunden!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Dies ist Ihre Ring-ID.\nKopieren und teilen Sie sie mit ihren Freunden!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring ist eine Freie Software für universelle Kommunikation und respektiert die Freiheiten und Privatsphäre der Benutzer."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatisch"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Hinweis: Dies wird das Passwort nur auf diesem Gerät ändern."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/de_DE.po b/po/de_DE.po
index 7a472ea9ce48c06ea8c2efe9896b456e85f650b3..f053a25b1edcb0d0cd5d14be1c863ffdf74ee68c 100644
--- a/po/de_DE.po
+++ b/po/de_DE.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: German (Germany) (http://www.transifex.com/savoirfairelinux/ring/language/de_DE/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -140,11 +140,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Ring-Konto erstellen"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -152,11 +152,11 @@ msgid "Link this device to an account"
 msgstr "Dieses Gerät mit einem Ring-Konto verknüpfen"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -177,7 +177,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -218,7 +218,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -235,12 +235,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Konto bestätigen"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -252,7 +252,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -265,19 +265,19 @@ msgid "OK"
 msgstr "Okay"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -340,7 +340,7 @@ msgstr "Allgemein"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Einstellungen"
 
@@ -410,8 +410,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -424,11 +424,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -443,7 +443,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -469,8 +469,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Bekannte Geräte, die mit diesem Ring-Konto verbunden sind"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -736,18 +736,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -795,7 +795,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -813,36 +813,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Schwaches Passwort"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -850,13 +850,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -876,11 +876,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Gerät widerrufen"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -904,35 +904,35 @@ msgstr "Kennwort anzeigen"
 msgid "Voicemail number"
 msgstr "Voicemail-Rufnummer"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -950,8 +950,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -966,65 +966,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Eingehender Anruf"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Verbindung mit Ring-Hintergrundprozess (dring) konnte nicht wiederhergestellt werden.\nRing wird jetzt beendet."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1077,116 +1077,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Passwörter stimmen nicht überein"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring ist Freie Software für universelle Kommunikation, die die Freiheiten und die Privatsphäre ihrer Nutzer respektiert."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/el.po b/po/el.po
index a42f32726d3d50fb6454ed49a34d8fc78115107e..0837a748d9f96321dde0b410f2fbba7ae57dc4ce 100644
--- a/po/el.po
+++ b/po/el.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Greek (http://www.transifex.com/savoirfairelinux/ring/language/el/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Ενοποίηση λογαριασμού"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -139,23 +139,23 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Δημιουργία λογαριασμού Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Δημιουργία ενός νέου λογαριασμού Ring (για νέους χρήστες)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Σύνδεση αυτής της συσκευής με ένα λογαριασμό"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Σύνδεση αυτών των συσκευών σε ένα λογαριασμό Ring που δημιουργήθηκε σε άλλη συσκευή"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Ακύρωση"
 
@@ -176,7 +176,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -217,10 +217,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Επιλέγοντας αυτό, θα καταχωρήσετε ένα μοναδικό όνομα χρήστη στο δίκτυο του Ring. Οι άνθρωποι θα μπορούν να το χρησιμοποιήσουν για να έρθουν σε επαφή μαζί σας, αντί να χρησιμοποιήσουν το RingID, που έχει μήκος 40 χαρακτήρων."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr "Αυτό το συνθηματικό θα χρησιμοποιηθεί για να κρυπτογραφήσει τα δεδομένα του λογαριασμού σας και να συνδέσει νέες συσκευές στο λογαριασμό σας."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr "Αυτό μπορεί να διαρκέσει λίγα λεπτά."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ρυθμίσεις Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Έναρξη Ring κατά την σύνδεση"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Εμφάνιση εικονιδίου Ring στην περιοχή ειδοποιήσεων (δίσκος συστήματος)"
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Μεταφορά του Ring στο προσκήνιο, κατά τις εισερχόμενες κλήσεις."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "Γενικά"
 msgid "Media"
 msgstr "Μέσα"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
@@ -409,10 +409,10 @@ msgstr "Προσθήκη νέας συσκευής"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "Για προσθήκη νέας συσκευής στον Ring λογαριασμό σας, μπορείτε να εξάγετε τον λογαριασμό σας στο Ring. Αυτό θα δημιουργήσει ένα PIN το οποίο πρέπει να εισάγετε στην νέα σας συσκευή μέσα σε 5 λεπτά από την δημιουργία του."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr "Εισαγωγή συνθηματικού αρχειοθέτησης"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Εξαγωγή στο Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -468,7 +468,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -735,18 +735,18 @@ msgstr "Καθορισμός επιλογής ως εικόνας"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Σφάλμα Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "Άκυρο"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Λανθασμένο συνθηματικό"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Σφάλμα δικτύου, δοκιμάστε ξανά"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Δεν μπορεί να κινήσει την εξαγωγή προς το Ring, προσπαθήστε ξανά"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Αποθήκευση αρχείου"
 
@@ -849,13 +849,13 @@ msgstr "Αποθήκευση αρχείου"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr "Εμφάνιση συνθηματικού"
 msgid "Voicemail number"
 msgstr "Αριθμός Voicemail"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Εμφάνιση προχωρημένων πληροφοριών"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Άνοιγμα εικόνας avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "Άνοιγμα"
 
@@ -949,9 +949,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ο GNOME πελάτης για το Ring.\nRing είναι ελεύθερο λογισμικό για την καθολική επικοινωνία που σέβεται τις ελευθερίες και την ιδιωτική ζωή των χρηστών του."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -965,65 +965,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "έναρξη κλήσης"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "άνοιγμα συνομιλίας"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Αναζήτηση επαφών ή εισαγωγή αριθμού"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Εισερχόμενη κλήση"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Σφάλμα Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Δεν μπόρεσε να γίνει επανασύνδεση στον δαίμονα του Ring (dring).\nΤο ring τώρα θα τερματιστεί."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "Επαναφέρει την κρυμένη κατάσταση του κύριου παραθύρου (εφαρμόζεται μόνο στο πρωταρχικό περιστατικό)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Πελάτης GNOME για το Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Τα συνθηματικά δεν ταιριάζουν"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Αυτό είναι το όνομα χρήστη που έχετε στο Ring.\nΑντιγράψτε και μοιραστείτε το με τους φίλους σας!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Αυτό είναι το RingID σου.\nΑντέγραψε το και μοιράσου το με τους φίλους σου!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Το Ring είναι ελεύθερο λογισμικό για παγκόσμια επικοινωνία που σέβεται τις ελευθερίες και την ιδιωτικότητα των χρηστών του."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Νέο συνθηματικό"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/eo.po b/po/eo.po
index f28879e8c80475dde01cecd04950b2e74831207b..71578e51ecfa6e07541761945cfca7af26b5fb7e 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Esperanto (http://www.transifex.com/savoirfairelinux/ring/language/eo/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Migrigi konton"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -139,23 +139,23 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Krei Ring Konton"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Krei novan Ring konton (por novaj uzantoj)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Ligi ĉi tiun aparaton al Ring konto kreita je alia aparato"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Rezigni"
 
@@ -176,7 +176,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -217,7 +217,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Konfirmu pasvorton"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr "Tio povas daŭri iom da minutoj."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "Okej"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring Agordoj"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Lanĉi Ring je ensaluto"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Montri Ring bildeton en la sciiga areo."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Superigi Ring je envenaj vokoj."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "Ĝenerala"
 msgid "Media"
 msgstr "Aŭdvidaĵo"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Agordoj"
 
@@ -409,10 +409,10 @@ msgstr "Aldoni Novan Aparaton"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr "Entajpu arĥivan pasvorton"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Elporti sur Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr "Identigaĵo"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -468,7 +468,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -735,18 +735,18 @@ msgstr "Uzu elektaĵon kiel bildo"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring Eraro"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Rezigni"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Malĝusta pasvorto"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Reteraro, reprovu poste"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Ne eblis komenci la elporton por Ring, reprovu poste"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Konservi Dosieron"
 
@@ -849,13 +849,13 @@ msgstr "Konservi Dosieron"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr "Montru pasvorton"
 msgid "Voicemail number"
 msgstr "Parolita mesaĝo"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Montri specialajn informojn"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Malfermi Profilbildon"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Malfermi"
 
@@ -949,9 +949,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "La GNOME kliento por Ring.\nRing estas libera programo por universala komunikado, kiu respektas liberon kaj privatecon de siaj uzantoj."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -965,65 +965,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "voki"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "malfermi babilejon"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Serĉu kontaktojn aŭ entajpu numeron"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Envena voko"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring Eraro"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Ne povis rekonekti al la Ring demono (dring).\nRing nun ĉesos."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "Restaŭras kaŝecon de la ĉefa fenestro (nur por la ĉefa ekzemplo)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME kliento por Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Pasvortoj ne kongruas"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Tio ĉi estas via RingID.\nKopiu kaj kunhavigu ĝin kun viaj amikoj!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring estas libera programo por universala komunikado, kiu respektas liberon kaj privatecon de siaj uzantoj."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Aŭtomata"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nova pasvorto"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/es.po b/po/es.po
index 2e73d66c74d325d945581fb37473cd49a5aa0fa8..121d33bb9711035447af3dbd6e82fc295aa4e510 100644
--- a/po/es.po
+++ b/po/es.po
@@ -35,8 +35,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Spanish (http://www.transifex.com/savoirfairelinux/ring/language/es/)\n"
 "MIME-Version: 1.0\n"
@@ -81,7 +81,7 @@ msgstr "Migrar cuenta"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Borrar cuenta"
 
@@ -164,23 +164,23 @@ msgid "Welcome to"
 msgstr "Bienvenido a"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Crear una cuenta Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Crear una nueva cuenta Ring (para usuarios nuevos)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Conectar este dispositivo a una cuenta"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Vincular este dispositivo con una cuenta Ring creada en otro"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -201,11 +201,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Para enlazar este dispositivo hacia otra cuenta, usted tiene dos posibilidades. Usted puede importar el usuario desde el DHT, pero primero, usted necesita obtener el código PIN. Para generar el código PIN, vaya a la configuración de administrador de usuario del anterior dispositivo, elija el Ring Usuario usar  y seleccione   \"Enlazar a otro dispositivo a esta cuenta \". Usted deberá obtener el PIN necesariamente para completar este formulario. El PIN es solo valido por 10 minutos. O, usted puede importarlo directamente la cuenta desde un fichero."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -242,10 +242,10 @@ msgstr "Registrar nombre de usuario"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Al marcar aquí, estarás registrando un nombre de usuario único en la red de Ring. Otras personas podrán utilizarlo para llamarte sin tener que utilizar tu identificador en Ring, RingID, de 40 caracteres."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -259,12 +259,12 @@ msgid ""
 "devices to your account."
 msgstr "La contraseña se utilizará para cifrar los datos de tu cuenta y para conectar nuevos dispositivos a tu cuenta."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confirmar contraseña"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -276,7 +276,7 @@ msgid "This may take a few minutes."
 msgstr "Esto puede llevar unos minutos."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -289,20 +289,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Configuración de Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Ejecutar Ring al iniciar la sesión"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Mostrar el icono de Ring en el área de notificaciones (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Mostrar Ring al recibir llamadas"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -364,7 +364,7 @@ msgstr "General"
 msgid "Media"
 msgstr "Medios"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Configuración"
 
@@ -434,10 +434,10 @@ msgstr "Agregar nuevo dispositivo"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -448,11 +448,11 @@ msgid "Enter archive password"
 msgstr "Introducir la contraseña del archivo"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Exportar en Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -467,7 +467,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Haga clic para cambiar la contraseña"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Exportar la cuenta"
 
@@ -493,8 +493,8 @@ msgid "Voicemail"
 msgstr "Mensaje de voz"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Dispositivos conocidos conectados a esta cuenta de Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -760,19 +760,19 @@ msgstr "Establecer la selección como imagen"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Incapaz de inicializar.\nAsegurese que el daemon de Ring (dring) esté activo.\nError: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Error de Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Abrir Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -819,7 +819,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -837,36 +837,36 @@ msgid "Choose download folder"
 msgstr "Elegir la carpeta de descargas"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Guardar"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Contraseña errónea"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Error en la red, inténtalo de nuevo"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "No se ha podido exportar en Ring, inténtalo de nuevo"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Guardar fichero"
 
@@ -874,13 +874,13 @@ msgstr "Guardar fichero"
 msgid "File exported to destination: "
 msgstr "Archivo exportado al destino:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "¡Advertencia! ¡Esta acción anulará el dispositivo!\nNota: esta acción no puede deshacerse."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Introduzca la contraseña para anular el dispositivo"
 
@@ -900,11 +900,11 @@ msgstr "Contraseña incorrecta"
 msgid "Save name"
 msgstr "Guardar nombre"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Anular dispositivo"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Error al anular el dispositivo"
 
@@ -928,35 +928,35 @@ msgstr "Mostrar contraseña"
 msgid "Voicemail number"
 msgstr "Número de Mensaje de Voz"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Error: ¡Contraseña incorrecta!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Error: ¡dispositivo desconocido!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Compartir el área de _pantalla"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Compartir el _monitor"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "_Archivo de transmisión"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Mostrar información avanzada"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Abrir imagen de avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -974,9 +974,9 @@ msgstr "\"Live Free or Die\"\nintegrado en %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "El cliente Ring de GNOME.\nRing es software libre de comunicaciones que respeta las libertades y la privacidad de sus usuarios."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -990,65 +990,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "llamar"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Abrir chat"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Buscar contacto o introducir número"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Abandonar la página de configuración"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "te está llamando."
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Nueva petición de"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Solicitud de confianza"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Nuevo mensaje"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Error de Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "No se pudo conectar con el demonio Ring (dring).\nRing se cerrará ahora."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1101,116 +1101,110 @@ msgid ""
 msgstr "Restaura el estado de ocultación de la ventana principal (únicamente la primera vez)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Cliente Gnome para Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Las contraseñas no coinciden"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Este es tu nombre de usuario en Ring.\n¡Cópialo y compártelo con tus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Este es tu RingID.\n¡Cópialo y compártelo con tus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring es software libre de comunicaciones que respeta las libertades y privacidad de sus usuarios."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Enviar archivo"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Esta acción eliminará esta cuenta de este dispositivo.\nNota: Este acción no puede deshacerse. Se perderá el nombre registrado."
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Editar nombre"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Desbloquear"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "¡La nueva contraseña y su confirmación es diferente!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "¡Contraseña incorrecta!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Nota: esto cambiará la contraseña solo en este dispositivo"
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Contraseña actual"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Contraseña nueva"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "¡Cuenta exportada!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Fallo al exportar la cuenta."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Inicializando…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Desconectado"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "En línea"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Estado desconocido"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "sin contraseña establecida"
diff --git a/po/es_AR.po b/po/es_AR.po
index 1121095cfdb0ed76df5932f8e8a0a96b518dc437..88ddddb4e90668abe8b11809fe984172d276c36e 100644
--- a/po/es_AR.po
+++ b/po/es_AR.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Spanish (Argentina) (http://www.transifex.com/savoirfairelinux/ring/language/es_AR/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "Migrar cuenta"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -137,23 +137,23 @@ msgid "Welcome to"
 msgstr "Bienvenido a"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Crear Cuenta de Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Crear una nueva cuenta de Ring (para nuevos usuarios)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Vincular este dispositivo a una cuenta"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -174,11 +174,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Para enlazar este dispositivo a otra cuenta, tenés dos posibilidades. Podés importar tu cuenta desde el DHT, pero primero necesitás obtener un código IN. Para generar el código PIN, ve a los ajustes de administración de cuenta de un dispositivo previo, elige la Cuenta de Ring a usar y seleccioná \"Enlazar otro dispositivo a esta cuenta\". Obtendrás el PIN necesario para completar este formulario. El PIN sólo es válido por 10 minutos. O podés directamente importa tu cuenta desde un archivo."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -232,12 +232,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confirmar contraseña"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -249,7 +249,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -262,19 +262,19 @@ msgid "OK"
 msgstr "Ok"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -337,7 +337,7 @@ msgstr "General"
 msgid "Media"
 msgstr "Medios"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Ajustes"
 
@@ -407,10 +407,10 @@ msgstr "Añadir Nuevo Dispositivo"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -421,11 +421,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -440,7 +440,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -466,8 +466,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Dispositivos conocidos enlazados a esta cuenta Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -733,18 +733,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -792,7 +792,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Cambiar contraseña"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -847,13 +847,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -873,11 +873,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Revocar dispositivo"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -901,35 +901,35 @@ msgstr "Mostrar contraseña"
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -947,8 +947,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -963,64 +963,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Llamada entrante"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Este es tu RingID.\n¡Copialo y compartilo con tus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring es software libre para comunicación universal que respeta las libertades y privacidad de sus usuarios."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nueva contraseña"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Error desconocido"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/eu.po b/po/eu.po
index baaf35c34e57f565050b95bdd9ad61295cdb29ae..b58380f7032a2876665611607e3d69d60c0042c1 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Basque (http://www.transifex.com/savoirfairelinux/ring/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -137,11 +137,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -149,11 +149,11 @@ msgid "Link this device to an account"
 msgstr "Estekatu gailua kontu batekin"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Ezeztatu"
 
@@ -174,7 +174,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -232,12 +232,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -249,7 +249,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -262,19 +262,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -337,7 +337,7 @@ msgstr "Orokorra"
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr ""
 
@@ -407,8 +407,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -421,11 +421,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -440,7 +440,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -466,7 +466,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -733,18 +733,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -792,7 +792,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -847,13 +847,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -873,11 +873,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -901,35 +901,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -947,8 +947,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -963,64 +963,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/fa_IR.po b/po/fa_IR.po
index 9c1d9fdf9831eb032f49d5b927eafababb6161ba..1dae4cbd5b7c0ce142a210ed92d688258b50ee2c 100644
--- a/po/fa_IR.po
+++ b/po/fa_IR.po
@@ -13,8 +13,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Persian (Iran) (http://www.transifex.com/savoirfairelinux/ring/language/fa_IR/)\n"
 "MIME-Version: 1.0\n"
@@ -59,7 +59,7 @@ msgstr "جابجایی حساب کاربری"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "حذف حساب"
 
@@ -142,23 +142,23 @@ msgid "Welcome to"
 msgstr "خوش آمدید به"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "ساخت حساب رینگ"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "ایجاد یک حساب رینگ جدید (برای کاربران جدید)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "پیوند این افزاره به یک حساب"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "پیوند این دستگاه به یک حساب رینگ ایجاد شده روی یک دستگاه دیگر"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "لغو"
 
@@ -179,7 +179,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -220,7 +220,7 @@ msgstr "ثبت نام کاربری"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -237,13 +237,13 @@ msgid ""
 "devices to your account."
 msgstr "از این گذرواژه برای رمزنگاری داده های حساب شما و برای پیوند دادن دستگاه های جدید به حساب شما  استفاده خواهد شد."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "تأیید گذرواژه"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "ایجاد حساب کاربری رینگ شما..."
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -254,8 +254,8 @@ msgid "This may take a few minutes."
 msgstr "این ممکن است چند دقیقه طول بکشد."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "در حال بازیابی حساب رینگ شما..."
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -267,19 +267,19 @@ msgid "OK"
 msgstr "خب"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "تنظیمات رینگ"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "باز کردن رینگ در هنگام لاگین"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "نمایش آیکون رینگ در ناحیه نوتیفیکیشن (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -342,7 +342,7 @@ msgstr "همگانی"
 msgid "Media"
 msgstr "رسانه"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "تنظیمات"
 
@@ -412,8 +412,8 @@ msgstr "افزودن افزاره نو"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -426,11 +426,11 @@ msgid "Enter archive password"
 msgstr "گذرواژه آرشیو را وارد کنید"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -445,7 +445,7 @@ msgstr "شناسه"
 msgid "Click to change password"
 msgstr "برای تغییر گذرواژه کلیک کنید"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "برون‌ریزی حساب"
 
@@ -471,8 +471,8 @@ msgid "Voicemail"
 msgstr "پیامگیر صوتی"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "افزاره‌های شناخته شدهٔ پیوسته به این حساب رینگ"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -738,19 +738,19 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "خطای رینگ"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "نمایش رینگ"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -797,8 +797,8 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "گذرواژه حساب کاربری رینگ خود را وارد کنید"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -815,36 +815,36 @@ msgid "Choose download folder"
 msgstr "انتخاب پوشه دانلود"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_لغو"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_ذخیره"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "گذرواژهٔ بد"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "خطای شبکه، دوباره تلاش کنید"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "تغییر رمز عبور"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "ذخیره فایل"
 
@@ -852,13 +852,13 @@ msgstr "ذخیره فایل"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -878,11 +878,11 @@ msgstr "گذرواژه ناصحیح"
 msgid "Save name"
 msgstr "ذخیره نام"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "باطل کردن دستگاه"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -906,35 +906,35 @@ msgstr "نمایش گذرواژه"
 msgid "Voicemail number"
 msgstr "شماره پست صوتی"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "خطا: گذرواژه اشتباه!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "خطا: دستگاه ناشناس!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "به اشتراک گذاری _مانیتور"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "جریان _فایل"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "نمایش اطّلاعات پیشرفته"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "گشودن تصویر آواتار"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_گشودن"
 
@@ -952,9 +952,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "نسخه گنوم برای رینگ.\nرینگ یک نرم‌افزار ارتباطات عمومی است که به آزادی‌ها و حریم شخصی کاربرانش احترام می‌گذارد."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -968,64 +968,64 @@ msgstr "توقف ضبط"
 msgid "Send recorded message"
 msgstr "ارسال پیام ضبط شده"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "افزودن حساب..."
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "گشودن گپ"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "تماس ورودی"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "درخواست جدید از جانب"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "درخواست اعتماد"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "پیام جدید"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "خطای رینگ"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1079,116 +1079,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- نرم‌افزار Ring تحت GNOME"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "گذرواژه‌ها یکسان نیستند"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "این نام کاربری رینگ شماست.\nکپی‌اش کنید و با دوستان‌تان به اشتراک بگذارید!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "این آی‌دی رینگ شماست.\nکپی‌اش کنید و با دوستان‌تان به اشتراک بگذارید!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "رینگ یک نرم‌افزار ارتباطات عمومی است که به آزادی‌ها و حریم شخصی کاربرانش احترام می‌گذارد."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "ارسال فایل"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "خودکار"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "ویرایش نام"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "گذرواژه و تاییدیه آن با هم فرق میکنند!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "گذرواژه اشتباه!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "توجه: این فقط گذرواژه روی این دستگاه را تغییر می دهد."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "گذرواژه فعلی"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "گذرواژهٔ نو"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "خطای ناشناخته"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "‌خط"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "در حال اتصال..."
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "برخط"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "وضعیت ناشناخته"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "هیچ گذرواژه ای تنظیم نشده است"
diff --git a/po/fi.po b/po/fi.po
index 787f523466ad95778ac0d0d668649359239d23c9..12444858788e426849ed4603c5c60016d007d867 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9,9 +9,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-21 21:44+0000\n"
-"Last-Translator: Tuomas Hietala <tuomas.hietala@kapsi.fi>\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
+"Last-Translator: Alexandre Lision\n"
 "Language-Team: Finnish (http://www.transifex.com/savoirfairelinux/ring/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -55,7 +55,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -150,11 +150,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Peru"
 
@@ -175,7 +175,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -216,7 +216,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -233,12 +233,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Varmista salasana"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -250,7 +250,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -263,20 +263,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Käynnistä Ring kirjauduttaessa"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Tuo ring eteen puhelun saapuessa"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -338,7 +338,7 @@ msgstr "Yleiset"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Asetukset"
 
@@ -408,8 +408,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -422,11 +422,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -734,18 +734,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -793,7 +793,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -811,36 +811,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Vaihda salasana"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Tallenna tiedosto"
 
@@ -848,13 +848,13 @@ msgstr "Tallenna tiedosto"
 msgid "File exported to destination: "
 msgstr "Tiedosto viety kohteeseen:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -874,11 +874,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -902,35 +902,35 @@ msgstr "Näytä salasana"
 msgid "Voicemail number"
 msgstr "Vastaajan numero"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -948,8 +948,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -964,64 +964,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Saapuva puhelu"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1075,116 +1075,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME asiakasohjelma Ringille"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Salasanat eivät täsmää"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automaattinen"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "salasanaa ei ole asetettu"
diff --git a/po/fr.po b/po/fr.po
index efc4d111ed1f5be1740a9febfcfb891ecc06c77e..f9e29becd5115941c01322433c44c3dd9c3977af 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -25,8 +25,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: French (http://www.transifex.com/savoirfairelinux/ring/language/fr/)\n"
 "MIME-Version: 1.0\n"
@@ -71,7 +71,7 @@ msgstr "Migrer le compte"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Supprimer le compte"
 
@@ -154,23 +154,23 @@ msgid "Welcome to"
 msgstr "Bienvenue sur"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Créer un compte Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Créer un nouveau compte Ring (pour les nouveaux utilisateurs)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Lier cet appareil à un compte"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Lier ces appareils à un compte Ring créé sur un autre appareil"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -191,11 +191,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Pour associer cet appareil à un compte Ring déjà existant sur un autre appareil, vous avez deux possibilités:\nVous pouvez importer votre compte via le réseau Ring. Pour cela vous devez obtenir un NIP du premier appareil. Aller dans la gestion du compte du premier appareil et choisissez \"Associer un autre appareil à ce compte\". Vous obtiendrez alors un NIP qui sera valide 10 minutes sur le réseau.\nVous pouvez également importer votre compte en important une archive de compte Ring."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -232,10 +232,10 @@ msgstr "Enregistrer le nom d'utilisateur"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "En cochant cette case, vous enregistrez un nom d'utilisateur unique sur le réseau Ring. Les personnes peuvent l'utiliser pour vous contacter au lieu d'utiliser votre RingID de 40 caractères."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -249,13 +249,13 @@ msgid ""
 "devices to your account."
 msgstr "Ce mot de passe sera utilisé pour crypter vos données et pour connecter vos nouveaux appareils à votre compte."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Génération de votre compte Ring …"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -266,8 +266,8 @@ msgid "This may take a few minutes."
 msgstr "Cela peut prendre quelques minutes."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Récupération de votre compte Ring …"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -279,20 +279,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Paramètres Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Lancer Ring à l’ouverture de session"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Afficher l’icône de Ring dans la zone de notification"
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Ramener Ring à l’avant-plan en cas d’appel entrant"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -354,7 +354,7 @@ msgstr "Général"
 msgid "Media"
 msgstr "Médias"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Paramètres"
 
@@ -424,10 +424,10 @@ msgstr "Ajout d'un nouvel appareil"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -438,12 +438,12 @@ msgid "Enter archive password"
 msgstr "Entrez ici le mot de passe de l’archive"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Exporter sur le Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Export du compte sur le Ring …"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -457,7 +457,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Cliquer ici pour changer le mot de passe"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Exporter compte"
 
@@ -483,8 +483,8 @@ msgid "Voicemail"
 msgstr "Boîte vocale"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Liste des appareils connus liés à votre compte Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -750,19 +750,19 @@ msgstr "Utiliser la sélection comme image de profil"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Impossible de démarrer\nVérifier que le serveur Ring  fonctionne\nErreur: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Erreur Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Afficher Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -809,8 +809,8 @@ msgid "Performing lookup…"
 msgstr "Recherche en cours ..."
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Entrez le mot de passe de votre compte Ring"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -827,36 +827,36 @@ msgid "Choose download folder"
 msgstr "Choisissez le dossier de téléchargement"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuler"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Sauvegarder"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Mot de passe incorrect"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Erreur réseau, veuillez réessayer."
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Impossible de lancer l'exportation vers Ring, réessayez"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "changer le mot de passe"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Sauvegarder"
 
@@ -864,13 +864,13 @@ msgstr "Sauvegarder"
 msgid "File exported to destination: "
 msgstr "Fichier exporté à destination :"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Avertissement ! Cette action révoquera l'appareil. Cette opération est irréversible."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Entrer le mot de passe pour révoquer l'appareil"
 
@@ -890,11 +890,11 @@ msgstr "Mot de passe incorrecte"
 msgid "Save name"
 msgstr "Sauvegarder le nom"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Révoquer l'appareil"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Erreur au cours de la révocation d'un appareil"
 
@@ -918,35 +918,35 @@ msgstr "Afficher le mot de passe"
 msgid "Voicemail number"
 msgstr "Numéro de boîte vocale"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Erreur :  mot de passe incorrect"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Erreur : appareil inconnu"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Partager une partie de votre écran"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Partager votre écran"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Diffuser un fichier"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Afficher les informations avancées"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Ouvrir l’image de profil"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -964,9 +964,9 @@ msgstr "\"Live Free or Die\"\ncompilé le %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ring pour GNOME.\nRing est un logiciel libre de communication universel  respectant les libertés et la vie privée de ses utilisateurs."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -980,65 +980,65 @@ msgstr "Arrêter l'enregistrement "
 msgid "Send recorded message"
 msgstr "Envoyer le message enregistré"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Ajouter un compte ..."
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Appeler"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ouvrir la discussion"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Rechercher dans les contacts ou appeler un numéro"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Quitter la page des réglages"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "vous appelle"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Nouvelle demande de "
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Invitation"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Nouveau message"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Erreur Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Redémarrage de Ring en cours …"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Impossible de se reconnecter au daemon Ring (dring).\nLe programme va maintenant se terminer."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1091,116 +1091,110 @@ msgid ""
 msgstr "Restaurer l’état caché de la fenêtre principale (applicable seulement à la première instance)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Ring pour GNOME"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Les mots de passes ne correspondent pas"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Voici votre nom d'utilisateur Ring.\nCopiez-le et partagez-le avec vos amis!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Voici votre RingID.\nCopiez-le et partagez-le avec vos amis !"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring est un logiciel libre de communication universel qui respecte les libertés et la vie privée de ses utilisateurs."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "Code QR de votre identifiant Ring"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Envoyez un fichier"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Attention ! Cette opération supprimera votre compte de l'appareil.\nVous pourriez perdre définitivement le nom d'enregistrement !"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Modifier le nom"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Ré-autoriser"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Les deux mots de passe sont différents !"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Mot de passe incorrect !"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Note : cette opération modifiera votre mot de passe uniquement sur cet appareil."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Mot de passe actuel"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Le compte a été exporté."
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Échec de l'export de compte."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Erreur inconnue"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Initialisation ..."
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Déconnecté"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "En cours de connexion ..."
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "En ligne"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "État inconnu"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "Pas de mot de passe"
diff --git a/po/fr_CA.po b/po/fr_CA.po
index bd2fb4d9759bebc1e88b1730554f05b8f60d98fc..f51b9ae7a3a206b4be01cbaa16a4de41479b2c8d 100644
--- a/po/fr_CA.po
+++ b/po/fr_CA.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: French (Canada) (http://www.transifex.com/savoirfairelinux/ring/language/fr_CA/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -141,11 +141,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Créer un compte Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -153,11 +153,11 @@ msgid "Link this device to an account"
 msgstr "Lier cet appareil à un compte"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Annuler"
 
@@ -178,11 +178,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Pour associer cet appareil à un compte Ring déjà existant sur un autre appareil, vous avez deux possibilités:\nVous pouvez importer votre compte via le réseau Ring. Pour cela vous devez obtenir un NIP du premier appareil. Aller dans la gestion du compte du premier appareil et choisissez \"Associer un autre appareil à ce compte\". Vous obtiendrez alors un NIP qui sera valide 10 minutes sur le réseau.\nVous pouvez également importer votre compte en important une archive de compte Ring."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -219,7 +219,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -236,12 +236,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confirmer le mot de passe"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -253,7 +253,7 @@ msgid "This may take a few minutes."
 msgstr "Cette opération peut prendre plusieurs minutes."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -266,19 +266,19 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Paramètres Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Lancer Ring au démarrage"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -341,7 +341,7 @@ msgstr "Général"
 msgid "Media"
 msgstr "Média"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Réglages"
 
@@ -411,10 +411,10 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "Pour associer un nouvel appareil à un compte Ring, vous exportez votre compte sur le réseau Ring. Cela générera un NIP que vous devrez saisir dans votre nouvel appareil dans les 10 minutes."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -425,11 +425,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -444,7 +444,7 @@ msgstr "Identifiant"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -470,8 +470,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Appareils connus associés à ce compte Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -737,18 +737,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Erreur Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -796,7 +796,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -814,36 +814,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuler"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Mauvais mot de passe"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Erreur réseau, réessayez"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Ne peut pas initier l'exportation sur le Ring"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Changer mot de passe"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Enregistrer le fichier"
 
@@ -851,13 +851,13 @@ msgstr "Enregistrer le fichier"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -877,11 +877,11 @@ msgstr "Mot de passe incorrect"
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Révoquer l'appareil"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -905,35 +905,35 @@ msgstr "Afficher le mot de passe"
 msgid "Voicemail number"
 msgstr "Numéro de boîte vocale"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Afficher l'information avancée "
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Ouvrir l'image de l'avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -951,9 +951,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ring pour GNOME\nRing est un logiciel libre de communication universel qui respecte la liberté et la vie privée de ses utilisateurs."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -967,64 +967,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Appeler"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Ouvrir le clavardage"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Rechercher des contacts ou entrer le numéro"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Appel entrant"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Erreur Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1078,116 +1078,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "Ring pour GNOME"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Les mots de passes en sont pas identiques"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Ceci est votre nom d'utilisateur Ring.\nCopiez-le et partagez-le avec vos amis !"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Ceci est votre RingId. Copiez et partagez le avec vos amis!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring est un logiciel libre de communication universel qui respecte la liberté et vie privée de ses utilisateurs."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Hors ligne"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "En ligne"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/fr_FR.po b/po/fr_FR.po
index 386a79165fa7f50783138b4e40eea5528216b2f5..d62c2ba1f6c155be0329484ccf7540f3507e56f8 100644
--- a/po/fr_FR.po
+++ b/po/fr_FR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: French (France) (http://www.transifex.com/savoirfairelinux/ring/language/fr_FR/)\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -136,11 +136,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -148,11 +148,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr ""
 
@@ -173,7 +173,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -214,7 +214,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -231,12 +231,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -248,7 +248,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -261,19 +261,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -336,7 +336,7 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -420,11 +420,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -439,7 +439,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -465,7 +465,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -732,18 +732,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -791,7 +791,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -809,36 +809,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "changer le mot de passe"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -846,13 +846,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -872,11 +872,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -900,35 +900,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr "boite vocale "
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -946,8 +946,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -962,64 +962,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1073,116 +1073,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nouveau mot de passe"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 0d9719cbcca3c899a1a79a6e97f6b5f02a2a55dc..502bb554ac55be9c4938d1b3480fbcd0e82d2e5e 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Hebrew (http://www.transifex.com/savoirfairelinux/ring/language/he/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -150,11 +150,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "ביטול"
 
@@ -175,7 +175,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -216,7 +216,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -233,12 +233,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -250,7 +250,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -263,19 +263,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "התחל את Ring בעת התחברות"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -338,7 +338,7 @@ msgstr "כלליות"
 msgid "Media"
 msgstr "מדיה"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "הגדרות"
 
@@ -408,8 +408,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -422,11 +422,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -441,7 +441,7 @@ msgstr "מזהה"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -734,18 +734,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -793,7 +793,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -811,36 +811,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_ביטול"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "סיסמה רעה"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -848,13 +848,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -874,11 +874,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -902,35 +902,35 @@ msgstr "הצג סיסמה"
 msgid "Voicemail number"
 msgstr "מספר תא קולי"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_פתח"
 
@@ -948,8 +948,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -964,64 +964,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "חפש אנשי קשר או הזן מספר"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "קריאה נכנסת"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1075,116 +1075,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- לקוח GNOME עבור Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "סיסמאות לא תואמות"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 79825c8f4b50fccc6328a2c9bf9fb3e6a183f5f7..4359be140433f468a317feaa6841c041fa17d606 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Croatian (http://www.transifex.com/savoirfairelinux/ring/language/hr/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -137,11 +137,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -149,11 +149,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Poništi"
 
@@ -174,7 +174,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -232,12 +232,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Potvrdi lozinku"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -249,7 +249,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -262,19 +262,19 @@ msgid "OK"
 msgstr "U redu"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -337,7 +337,7 @@ msgstr "Opće"
 msgid "Media"
 msgstr "Medij"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Postavke"
 
@@ -407,8 +407,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -421,11 +421,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -440,7 +440,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -466,8 +466,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Poznati uređaji povezani sa ovim Ring računom"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -733,18 +733,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -792,7 +792,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Spremi datoteku"
 
@@ -847,13 +847,13 @@ msgstr "Spremi datoteku"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -873,11 +873,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -901,35 +901,35 @@ msgstr "Prikaži lozinku"
 msgid "Voicemail number"
 msgstr "Broj govorne pošte"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -947,8 +947,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -963,64 +963,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Traži kontakt ili unesi broj"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Dolazni poziv"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME klijent za Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nova lozinka"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 74ea30b247db831da0a3553134389fd2858ff7e7..25a500a9e4fcc6ddadeee88ed18e363705361728 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -10,9 +10,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 09:14+0000\n"
-"Last-Translator: . . <ovari123@zoho.com>\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
+"Last-Translator: Alexandre Lision\n"
 "Language-Team: Hungarian (http://www.transifex.com/savoirfairelinux/ring/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +56,7 @@ msgstr "Fiók migrálása"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Fiók törlése"
 
@@ -139,23 +139,23 @@ msgid "Welcome to"
 msgstr "Isten hozott"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Ring fiók létrehozása"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Új Ring fiók létrehozása (új felhasználóknak)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Ezen eszköz fiókhoz kapcsolása"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Ezen eszköz, egy másik eszközön létrehozott Ring fiókhoz kapcsolása"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Mégse"
 
@@ -176,11 +176,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Az eszköz másik fiókhoz kapcsolásához kettő lehetőség van .Importálhatja fiókját a DHT-ből, de először PIN-kódra van szüksége. A PIN-kód előállításához menjen egy korábbi eszköz fiókkezelési beállításába, válassza ki a használandó Ring fiókot, és válassza a „Másik eszköz hozzákapcsolása ehhez a fiókhoz” lehetőséget. Meg fogja kapni az űrlap kitöltéséhez szükséges PIN-kódot. A PIN-kód csak 10 percig érvényes. Vagy közvetlenül importálhatja fiókját egy archívumból."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -217,10 +217,10 @@ msgstr "Regisztráljon felhasználónevet"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Ezt bejelölve, regisztrál egy egyedi felhasználónevet a Ring hálózaton. Az emberek ezt a Ring azonosítója (amely 40 karakter hosszú) helyett használhatják, hogy elérjék Önt."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -234,13 +234,13 @@ msgid ""
 "devices to your account."
 msgstr "Ez a jelszó a fiókadatainak titkosítására lesz használva, és arra, hogy más eszközöket kapcsoljon a fiókjához."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Jelszó megerősítése"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "A Ring-fiókja létrehozása…"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -251,8 +251,8 @@ msgid "This may take a few minutes."
 msgstr "Ez néhány percet is igénybe vehet."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "A Ring-fiókja lekérése…"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring beállítások"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "A Ring indítása bejelentkezéskor"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "A Ring ikon megjelenítése az értesítési területen (rendszertálca)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "A Ring előtérbe hozása bejövő hívások esetén."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "Általános"
 msgid "Media"
 msgstr "Média"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Beállítások"
 
@@ -409,10 +409,10 @@ msgstr "Új eszköz hozzáadása"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "Ahhoz hogy új eszközt adjon a Ring fiókjához, exportálnia kell a fiókját a Ringen. Ez előállít egy PIN-t, amit meg kell adnia az új eszközén, az előállítástól számított 5 percen belül."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,12 +423,12 @@ msgid "Enter archive password"
 msgstr "Adja meg az archívum jelszavát"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Ring exportálása"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Fiók exportálása a Ringen…"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -442,7 +442,7 @@ msgstr "Azonosító"
 msgid "Click to change password"
 msgstr "Kattintson a jelszó módosításához"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Felhasználó fiók exportálása"
 
@@ -468,8 +468,8 @@ msgid "Voicemail"
 msgstr "Hangposta"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Ring-fiókhoz kapcsolódó ismert eszközök"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -735,19 +735,19 @@ msgstr "Kijelölés beállítása képként"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Képtelen elkezdeni\nGyőződjön meg róla, hogy a Ring daemon (dring) fut.\nHiba: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring hiba"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "A Ring megnyitása"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -794,8 +794,8 @@ msgid "Performing lookup…"
 msgstr "Betekintés végrehajtása…"
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Adja meg a Ring-fiókja jelszavát"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr "Letöltési mappa kiválasztása"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Mégse"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Mentés"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Hibás jelszó"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Hálózati hiba, próbálja újra"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "A Ring export elindítása nem sikerült, próbálja újra"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Jelszó megváltoztatása"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Fájl mentése"
 
@@ -849,13 +849,13 @@ msgstr "Fájl mentése"
 msgid "File exported to destination: "
 msgstr "Fájlok mentése:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Figyelmeztetés! Ez a művelet visszavonja az eszközt!\nMegjegyzés: ez a művelet nem vonható vissza."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Jelszó megadása az eszköz visszavonásához"
 
@@ -875,11 +875,11 @@ msgstr "Hibás jelszó"
 msgid "Save name"
 msgstr "Név mentése"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Eszköz visszavonása"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Hiba történt az eszköz visszavonásakor"
 
@@ -903,35 +903,35 @@ msgstr "Jelszó megjelenítése"
 msgid "Voicemail number"
 msgstr "Hangpostaszám"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Hiba: hibás jelszó!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Hiba: ismeretlen eszköz!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "_Képernyő részének megosztása"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "_Monitor megosztása"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Stream _fájl"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Haladó információk megjelenítése"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Avatar megnyitása"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Megnyitás"
 
@@ -949,9 +949,9 @@ msgstr "„Élj szabadon vagy halj meg”\nkódtár verziója: %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "A GNOME kliens a Ringhez.\nA Ring egy szabad szoftver az univerzális kommunikációhoz, amely tiszteletben tartja a felhasználók szabadságát és magánszféráját."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -965,65 +965,65 @@ msgstr "Felvétel leállítása"
 msgid "Send recorded message"
 msgstr "Felvett üzenet küldése"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Fiók hozzáadása…"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Hívás kezdeményezése"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Csevegés megnyitása"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Partnerek keresése vagy szám beírása"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "A beállítási oldal elhagyása"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr " hív!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Bejövő hívás"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Új kérés"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Megbízható kérelem"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Új üzenet"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring hiba"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Újrakapcsolódás a Ring démonhoz (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Nem sikerült újrakapcsolódni a Ring démonhoz (dring).\nA Ring most kilép."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "Visszaállítja a főablak rejtett állapotát (csak az elsődleges példányra vonatkozik)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "– GNOME kliens a Ring-hez"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "A jelszavak nem egyeznek"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Ez az Ön Ring azonosítója.\nMásolja ki, és ossza meg barátaival!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Ez az Ön Ring azonosítója.\nMásolja és ossza meg a barátaival!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "A Ring egy szabad szoftver az univerzális kommunikációhoz, amely tiszteletben tartja a felhasználók szabadságát és magánszféráját."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "Ring azonosító QR-kód"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Fájl küldése"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Figyelmeztetés! Ez a művelet eltávolítja ezt a fiókot az eszközön!\nMegjegyzés: ez a művelet nem vonható vissza. A regisztrált neved is elveszhet!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatikus"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Név szerkesztése"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Letiltás visszavonása"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Az új jelszó és a megerősítése különböző!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Hibás jelszó!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Megjegyzés: a jelszó megváltoztatása csak ezen az eszközön."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Jelenlegi jelszó"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Új jelszó"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "A fiókot exportálták!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Fiók exportálási hiba."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Szignál…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Nem elérhető"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Kapcsolódás…"
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Elérhető"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Ismeretlen állapot"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "nincs jelszó beállítva"
diff --git a/po/id.po b/po/id.po
index 3bf601b7f9796bbb8b3f4a687c5ffa2e94cb8311..80b63fa5995a6d2e279d100c36f55a6125c2d0e1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Indonesian (http://www.transifex.com/savoirfairelinux/ring/language/id/)\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -136,11 +136,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -148,11 +148,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr ""
 
@@ -173,7 +173,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -214,7 +214,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -231,12 +231,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -248,7 +248,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -261,19 +261,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -336,7 +336,7 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr ""
 
@@ -406,8 +406,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -420,11 +420,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -439,7 +439,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -465,7 +465,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -732,18 +732,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -791,7 +791,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -809,36 +809,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -846,13 +846,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -872,11 +872,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -900,35 +900,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -946,8 +946,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -962,64 +962,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1073,116 +1073,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Kata sandi baru"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/it.po b/po/it.po
index 5eea25a5037828e6274feac6345919a53987ac6b..fe3f3a68267fbbc99f23cf9ffaa0739d443c89f8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Italian (http://www.transifex.com/savoirfairelinux/ring/language/it/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -150,11 +150,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Cancella"
 
@@ -175,7 +175,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -216,7 +216,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -233,12 +233,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confermare password"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -250,7 +250,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -263,20 +263,20 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Impostazioni di Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Avviare Ring al login"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Mostrare l'icona di Ring nell'area di notificazione (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Portare Ring al primo piano al arrivo di chiamate."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -338,7 +338,7 @@ msgstr "Generale"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Impostazioni"
 
@@ -408,8 +408,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -422,11 +422,11 @@ msgid "Enter archive password"
 msgstr "Digitare la password dell'archivio"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -467,8 +467,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Dispositivi conosciuti collegati a questo account Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -734,18 +734,18 @@ msgstr "Impostare la selezione come immagine"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Errore di Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -793,7 +793,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -811,36 +811,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "A_bbandonare"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -848,13 +848,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -874,11 +874,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Revoca dispositivo"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -902,35 +902,35 @@ msgstr "Mostrare la password"
 msgid "Voicemail number"
 msgstr "Numero di segreteria telefonica"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Aprire l'immagine di avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Aprire"
 
@@ -948,8 +948,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -964,65 +964,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Ricercare contatto o digitare un numero"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Chiamata in arrivo"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Errore di Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Impossibile riconnettersi con il demone Ring (dring).\nRing uscirà."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1075,116 +1075,110 @@ msgid ""
 msgstr "Ristorare lo stato nascosto della finestra principale (applicabile solo all'instanza principale)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Cliente GNOME per Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Le password no corrispondono"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Questo è il suo RingID.\nDa copiare e condividere con gli amici!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring è un software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti"
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nuovo password"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/it_IT.po b/po/it_IT.po
index 5ae3634f248071e61a3b0e3bb5074550bd6a110b..4ec72d2f6a92d5284233d7f6a57ed0b284844b32 100644
--- a/po/it_IT.po
+++ b/po/it_IT.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Italian (Italy) (http://www.transifex.com/savoirfairelinux/ring/language/it_IT/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "Migra account"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -140,23 +140,23 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Crea Account Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Crea un nuovo account Ring (per nuovi utenti)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Collega questo dispositivo ad un account"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Collega questo dispositivo ad un account RIng creato su un altro dispositivo"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Annulla"
 
@@ -177,7 +177,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -218,10 +218,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Selezionando questo, registrerai un nome utente unico nella rete Ring. Le persone possono utilizzarlo per contattarti invece di usare il tuo RingID, che è lungo 40 caratteri."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -235,12 +235,12 @@ msgid ""
 "devices to your account."
 msgstr "Questa password verrà utilizzata per crittografare i tuoi dati dell'account e per collegare i nuovi dispositivi al tuo account."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Conferma password"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -252,7 +252,7 @@ msgid "This may take a few minutes."
 msgstr "Questa operazione potrebbe richiedere alcuni minuti."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -265,20 +265,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Impostazioni Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Avvia Ring al login"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Mostra l'icona di Ring nell'area di notifica (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Mostra Ring in primo piano durante le chiamate in arrivo."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -340,7 +340,7 @@ msgstr "Generale"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Opzioni"
 
@@ -410,10 +410,10 @@ msgstr "Aggiungi Nuovo Dispositivo"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -424,11 +424,11 @@ msgid "Enter archive password"
 msgstr "Immetti password archivio"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Esporta su Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -443,7 +443,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -469,8 +469,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Dispositivi registrati su questo account Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -736,18 +736,18 @@ msgstr "Imposta l'immagine selezionata"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Errore di Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -795,7 +795,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -813,36 +813,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annulla"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Password scarsa"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Errore di rete, riprova"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Non è stato possibile iniziare l'esportazione a Ring, riprova"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Salva File"
 
@@ -850,13 +850,13 @@ msgstr "Salva File"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -876,11 +876,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Revoca dispositivo"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -904,35 +904,35 @@ msgstr "Visualizza password"
 msgid "Voicemail number"
 msgstr "Numero voicemail"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Mostra informazioni avanzate"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Apri immagine dell'Avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Apri"
 
@@ -950,9 +950,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Il client GNOME per Ring.\nRing è software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -966,65 +966,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "chiama"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "apri chat"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Cerca tra i contatti o inserisci un numero"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Chiamata in ingresso"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Errore di Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Non è stato possibile riconnettersi al demone Ring (dring)\nRing ora verrà terminato."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1077,116 +1077,110 @@ msgid ""
 msgstr "Ripristina lo stato nascosto della finestra principale (applicabile solo all'istanza principale)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Client GNOME per Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Le password non coincidono"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Questo è il tuo nome utente Ring.\nCopialo e condividilo con i tuoi amici!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Questo è il tuo RingID.\nCopialo e condividilo con i tuoi amici!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring è software libero per la comunicazione universale che rispetta le libertà e la privacy dei suoi utenti."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nuova password"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Disconnesso"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "In linea"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/ja.po b/po/ja.po
index 7825c7cff260e55df8a3f393446be8766e8663eb..4f8cdfe4084a09ce359e8a7c767aa3bc20d8fb75 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Japanese (http://www.transifex.com/savoirfairelinux/ring/language/ja/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -150,11 +150,11 @@ msgid "Link this device to an account"
 msgstr "この端末をアカウントへリンク"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "キャンセル"
 
@@ -175,7 +175,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -216,7 +216,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -233,12 +233,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "パスワードの再入力"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -250,7 +250,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -263,20 +263,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ringの設定"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "ログイン時にRingを起動する"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Ring アイコンを通知エリア (systray) に表示する。"
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "着信時に Ring を最前面に表示する。"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -338,7 +338,7 @@ msgstr "全般"
 msgid "Media"
 msgstr "メディア"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "設定"
 
@@ -408,8 +408,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -422,11 +422,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -441,7 +441,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -467,8 +467,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "既知のデバイスがこのRingアカウントにリンクされています"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -734,18 +734,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring エラー"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -793,7 +793,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -811,36 +811,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "キャンセル(_C)"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "パスワードが正しくありません"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "ネットワークエラーが発生しました。もう一度試してください。"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Ring への書き出しを開始できません。もう一度試してください。"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -848,13 +848,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -874,11 +874,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "デバイスを取り消し"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -902,35 +902,35 @@ msgstr "パスワードを表示"
 msgid "Voicemail number"
 msgstr "ボイスメール番号"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "詳細情報を表示"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "アバター画像を開く"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -948,8 +948,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -964,65 +964,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "通話を開始"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "チャットを開く"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "連絡先または番号を検索"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "着信"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring エラー"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Ring デーモンへの再接続に失敗しました (dring)。\nRing を終了します。"
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1075,116 +1075,110 @@ msgid ""
 msgstr "メインウィンドウの隠し状態を復元します (最初のインスタンスにのみ適用可能)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Ring 用の GNOME クライアント"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "パスワードが一致しません"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "これがあなたの Ring ユーザー名です。\nコピーして友達とシェアしましょう!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "これがあなたの RingID です。\nコピーして友達とシェアしましょう!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring は、ユーザーの自由とプライバシーを尊重する普遍的なコミュニケーションのためのフリーソフトウェアです。"
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "新しいパスワード"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "オフライン"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "オンライン"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/ko_KR.po b/po/ko_KR.po
index ab0d2ee06efbc2fd7343f7a7aaa59ad87572c0cc..0f83f444de0188571e3b8f5ae854b8d8fcb11232 100644
--- a/po/ko_KR.po
+++ b/po/ko_KR.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/savoirfairelinux/ring/language/ko_KR/)\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -136,11 +136,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -148,11 +148,11 @@ msgid "Link this device to an account"
 msgstr "이 장치를 계정에 연결하기"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "취소"
 
@@ -173,7 +173,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -214,7 +214,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -231,12 +231,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "암호 확인"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -248,7 +248,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -261,19 +261,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -336,7 +336,7 @@ msgstr "일반"
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "설정"
 
@@ -406,8 +406,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -420,11 +420,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -439,7 +439,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -465,7 +465,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -732,18 +732,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -791,7 +791,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -809,36 +809,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "파일 저장"
 
@@ -846,13 +846,13 @@ msgstr "파일 저장"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -872,11 +872,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -900,35 +900,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr "음성메일 번호"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -946,8 +946,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -962,64 +962,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1073,116 +1073,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "이것이 당신의 RingID입니다.\n복사 후 당신의 친구들에게 공유하세요!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "자동"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index c245fe94921926762e4508efa8a698251dc9827e..05c3031a3fb2a44af174249098ba7cb7586bce3d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Lithuanian (http://www.transifex.com/savoirfairelinux/ring/language/lt/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Perkelti paskyrą"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Ištrinti paskyrą"
 
@@ -139,23 +139,23 @@ msgid "Welcome to"
 msgstr "Sveiki atvykę į"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Susikurti Ring paskyrą"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Sukurti naują Ring paskyrą (naujiems naudotojams)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Susieti šį įrenginį su paskyra"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Susieti šį įrenginį su kitame įrenginyje sukurta Ring paskyra"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Atsisakyti"
 
@@ -176,11 +176,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Norėdami susieti šį įrenginį su kita paskyra, jūs turite dvi galimybes. Galite importuoti savo paskyrą iš DHT, bet iš pradžių, turėsite gauti PIN kodą. Norėdami sukurti PIN kodą, pereikite ankstesniame įrenginyje į paskyros tvarkymo nustatymą, pasirinkite norimą naudoti Ring paskyrą ir pasirinkite \"Susieti kitą įrenginį su šia paskyra\". Jūs gausite šiai formai užpildyti reikalingą PIN kodą. PIN kodas galioja tik 10 minučių. Arba galite tiesiogiai importuoti savo paskyrą iš archyvo."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -217,10 +217,10 @@ msgstr "Registruoti naudotojo vardą"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Tai pažymėję, jūs Ring tinkle užregistruosite unikalų naudotojo vardą. Norėdami su jumis susisiekti, žmonės galės jį naudoti vietoj jūsų RingID, kuris yra 40 simbolių ilgio."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr "Šis slaptažodis bus naudojamas jūsų paskyros duomenų šifravimui ir, norint susieti naują įrenginį su jūsų paskyra."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Patvirtinkite slaptažodį"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr "Tai gali užtrukti kelias minutes."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "Gerai"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring nustatymai"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Paleisti Ring, įjungus kompiuterį"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Rodyti Ring piktogramą pranešimų srityje (sistemos dėkle)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Esant gaunamiesiems skambučiams, rodyti Ring priekiniame plane."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "Bendra"
 msgid "Media"
 msgstr "Medija"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Nustatymai"
 
@@ -409,10 +409,10 @@ msgstr "Pridėti naują įrenginį"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr "Įveskite archyvo slaptažodį"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Eksportuoti Ring sistemoje"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Spustelėkite, norėdami pakeisti slaptažodį"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Eksportuoti paskyrą"
 
@@ -468,8 +468,8 @@ msgid "Voicemail"
 msgstr "Balso paštas"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Žinomi, su šia Ring paskyra susieti, įrenginiai"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -735,19 +735,19 @@ msgstr "Nustatyti pažymėtą sritį kaip paveikslą"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Nepavyko inicijuoti.\nĮsitikinkite, kad Ring tarnyba (dring) yra paleista.\nKlaida: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring klaida"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Rodyti Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Atsisakyti"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "Į_rašyti"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Blogas slaptažodis"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Tinklo klaida, bandykite dar kartą"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Nepavyko inicijuoti eksportavimą į Ring, pabandykite dar kartą"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Pakeisti slaptažodį"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Įrašyti failą"
 
@@ -849,13 +849,13 @@ msgstr "Įrašyti failą"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Įspėjimas! Šis veiksmas panaikins įrenginį!\nPastaba: šio veiksmo neįmanoma bus atšaukti."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr "Neteisingas slaptažodis"
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Panaikinti įrenginį"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Klaida, panaikinant įrenginį"
 
@@ -903,35 +903,35 @@ msgstr "Rodyti slaptažodį"
 msgid "Voicemail number"
 msgstr "Balso pašto numeris"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Klaida: neteisingas slaptažodis!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Klaida: nežinomas įrenginys!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Bendrinti _ekrano sritį"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Rodyti išplėstinę informaciją"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Atverti avataro paveikslą"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "A_tverti"
 
@@ -949,9 +949,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "GNOME klientas, skirtas Ring.\nRing yra visuotiniam susisiekimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -965,65 +965,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Pridėti paskyrą…"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "skambinti"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "atverti pokalbį"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Ieškokite kontaktus arba įveskite numerį"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Gaunamasis skambutis"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Nauja žinutė"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring klaida"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Bandoma iš naujo prisijungti prie Ring tarnybos (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Nepavyko iš naujo prisijungti prie Ring tarnybos (dring).\nRing baigs savo darbą."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "Atkuria pagrindinio lango paslėptą būseną (pritaikoma tik pirminiam egzemplioriui)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME kliento programa, skirta Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Slaptažodžiai nesutampa"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Tai yra jūsų Ring naudotojo vardas.\nNukopijuokite ir dalinkitės juo su draugais!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Tai yra jūsų RingID.\nNukopijuokite ir dalinkitės juo su savo draugais!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring yra visuotiniam susisiekimui skirta laisva programinė įranga, kuri gerbia savo naudotojų laisves ir privatumą."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Siųsti failą"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatinė"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Naujas slaptažodis ir jo patvirtinimas nesutampa!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Neteisingas slaptažodis!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Pastaba: tai pakeis slaptažodį tik šiame įrenginyje."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Dabartinis slaptažodis"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Naujas slaptažodis"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Paskyra eksportuota!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Paskyros eksportavimas nepavyko."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Nežinoma klaida"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Inicijuojama…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Atsijungęs"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Prisijungęs"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Nežinoma būsena"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "slaptažodis nėra nustatytas"
diff --git a/po/ms.po b/po/ms.po
index 89c99a1134d58bd669a0293398a6f1334e8e6224..601f1fbfef8d6c3bfccc0575fa46b9f380eb9015 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Malay (http://www.transifex.com/savoirfairelinux/ring/language/ms/)\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -136,11 +136,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -148,11 +148,11 @@ msgid "Link this device to an account"
 msgstr "Sambungkan perangkat ini dengan akaun"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Batal"
 
@@ -173,7 +173,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -214,7 +214,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -231,12 +231,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Sahkan kata laluan"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -248,7 +248,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -261,19 +261,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -336,7 +336,7 @@ msgstr "Utama"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Aturan"
 
@@ -406,8 +406,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -420,11 +420,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -439,7 +439,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -465,8 +465,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Perangkat dikenali yang telah disambungkan dengan akaun Ring ini"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -732,18 +732,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -791,7 +791,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -809,36 +809,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -846,13 +846,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -872,11 +872,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -900,35 +900,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr "Nombor peti suara"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -946,8 +946,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -962,64 +962,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Panggilan masuk"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1073,116 +1073,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Kata laluan baharu"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index c535a040cb1d45728139801570e5224be988207e..4cadd6da6fad3cb406eba20b865ad802b1161530 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Norwegian Bokmål (http://www.transifex.com/savoirfairelinux/ring/language/nb/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr "Overfør konto"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Slett konto"
 
@@ -138,23 +138,23 @@ msgid "Welcome to"
 msgstr "Velkommen til"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Opprett Ring-konto"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Opprett en ny Ring-konto (for nye brukere)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Lenk denne enheten til en konto"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Lenk denne enheten til en Ring-konto opprettet på en annen enhet"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -175,11 +175,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "For å lenke denne enheten til en annen konto har du to muligheter. Du kan importere kontoen fra DHT, men først hente en PIN-kode. For å generere PIN-koden, gå til kontobehandlingsinnstillingne fra en tidligere enhet, velg Ring-kontoen du vil bruke og finn \"Lenk en annen enhet til denne kontoen\". Du vil få nødvendig PIN for å fullføre skjemaet. PIN-koden er bare gyldig i 10 minutter."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -216,10 +216,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Ved uthuking av dette, vil du registrere et unikt brukernavn på Ring-nettverket. Folk kan bruke det for å komme i kontakt med deg istedenfor å bruke din 40 tegn lange RingID."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -233,12 +233,12 @@ msgid ""
 "devices to your account."
 msgstr "Dette passordet vil brukes til å kryptere din kontodata og lenke nye enheter til din konto."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Bekreft passord"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -250,7 +250,7 @@ msgid "This may take a few minutes."
 msgstr "Dette kan ta noen minutter."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -263,20 +263,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring-innstillinger"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Start Ring ved innlogging"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Vis Ring-ikon i merknadsområdet (systemkurv)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Ta Ring i forgrunnen når noen ringer"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -338,7 +338,7 @@ msgstr "Generell"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Innstillinger"
 
@@ -408,10 +408,10 @@ msgstr "Legg til ny enhet"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -422,11 +422,11 @@ msgid "Enter archive password"
 msgstr "Skriv inn arkivpassord"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Eksporter på Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -441,7 +441,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Eksporter konto"
 
@@ -467,8 +467,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Kjente enheter som er lenket til denne Ring-kontoen"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -734,19 +734,19 @@ msgstr "Bruk utvalg som bilde"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Kunne ikke starte.\nForsikre deg om at Ring-nissen (dring) kjører.\nFeil: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Feil med ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Vis Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -793,7 +793,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -811,36 +811,36 @@ msgid "Choose download folder"
 msgstr "Velg nedlastingsmappe"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Avbryt"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Lagre"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Dårlig passord"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Nettverksfeil, prøv på nytt"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Kunne ikke igangsette eksportering til Ring, prøv igjen"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Endre passord"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Lagre fil"
 
@@ -848,13 +848,13 @@ msgstr "Lagre fil"
 msgid "File exported to destination: "
 msgstr "Fil eksportert til mål:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -874,11 +874,11 @@ msgstr "Feil passord"
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Tilbakekall enhet"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -902,35 +902,35 @@ msgstr "Vis passord"
 msgid "Voicemail number"
 msgstr "Talepostkassenummer"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Del _skjermområde"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Del _monitor"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Strømme_fil"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Vis avansert informasjon"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Åpne avatarbilde"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -948,9 +948,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "GNOME-klienten for Ring.\nRing er fri programvare for universell kommunikasjon som respekterer privatlivets fred for dets brukere."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -964,65 +964,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "utfør samtale"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "åpne sludring"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Søk kontakter eller skriv inn nummer"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Innkommende samtale"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Feil med ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Kunne ikke koble til Ring-nissen igjen (dring).\nRing vil nå avslutte."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1075,116 +1075,110 @@ msgid ""
 msgstr "Tilbakestiller den skjulte tilstanden til hovedvinduet (gjelder kun for primærinstansen)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME-klient for Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Passordene er ikke like"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Dette er ditt Ring-brukernavn.\nKopier og del det med dine venner!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Dette er din RingID.\nKopier og del den med dine venner!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring er fri programvare for universell kommunikasjon som respekterer privatlivets fred for dets brukere."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Send fil"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Merk: Dette vil endre passordet kun på denne enheten."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Nåværende passord"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nytt passord"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Ukjent feil"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Starter…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Frakoblet"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Tilkoblet"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index 7f0670082ec72ed644eafdb7d3746a07d9d5834b..d6bc24b94ac4bb9e687a1ed9c77dab52fcbd2552 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Dutch (http://www.transifex.com/savoirfairelinux/ring/language/nl/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Account migreren"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Account verwijderen"
 
@@ -139,23 +139,23 @@ msgid "Welcome to"
 msgstr "Welkom bij"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Ring-account aanmaken"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Een Ring-account aanmaken (voor nieuwe gebruikers)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Dit apparaat aan een account koppelen"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Dit apparaat koppelen aan een Ring-account aangemaakt op een ander apparaat"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -176,11 +176,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Om dit apparaat aan een andere account te koppelen heb je twee mogelijkheden. Je kan je account importeren uit de DHT, maar eerst moet je een pincode verkrijgen. Ga om de pincode te genereren naar de accountbeheerinstellingen van een vorig apparaat, kies de Ring-account die je wil gebruiken en selecteer ‘Een ander apparaat aan deze account koppelen’. Je zal de pincode krijgen die je nodig hebt om dit proces te voltooien. De pincode is slechts 10 minuten geldig. Je kan je account ook rechtstreeks uit een archiefbestand importeren."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -217,10 +217,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Als je dit aanvinkt zal je een unieke gebruikersnaam op het Ring-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken om je te bellen, ipv je 40 tekens lange Ring-ID."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr "Dit wachtwoord wordt gebruikt om je accountgegevens te versleutelen en nieuwe apparaten aan je account te koppelen."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Bevestig wachtwoord"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr "Dit kan enkele minuten duren."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "Oké"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring-instellingen"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Ring opstarten bij het aanmelden"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Ring-pictogram weergeven in de meldingen (systeemvak)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Ring naar voorgrond brengen bij inkomende oproepen."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "Algemeen"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -409,10 +409,10 @@ msgstr "Nieuw apparaat toevoegen"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr "Voer archiefwachtwoord in"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Exporteren naar de Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Account exporteren"
 
@@ -468,8 +468,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Bekende apparaten gekoppeld aan deze Ring-account"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -735,19 +735,19 @@ msgstr "Selectie instellen als afbeelding"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Kan niet initialiseren.\nZorg dat de Ring-daemon (dring) wordt uitgevoerd.\nFout: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring-fout"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Ring tonen"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr "Kies downloadmap"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuleren"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "Op_slaan"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Slecht wachtwoord"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Netwerkfout, probeer het opnieuw"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Kon export naar de Ring niet initialiseren, probeer het opnieuw"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Wachtwoord wijzigen"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Bestand opslaan"
 
@@ -849,13 +849,13 @@ msgstr "Bestand opslaan"
 msgid "File exported to destination: "
 msgstr "Bestand geëxporteerd naar locatie:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr "Onjuist wachtwoord"
 msgid "Save name"
 msgstr "Naam opslaan"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Apparaat terugtrekken"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr "Wachtwoord tonen"
 msgid "Voicemail number"
 msgstr "Voicemailnummer"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "_Schermruimte delen"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Beeldscher_m delen"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Bes_tand streamen"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Toon geavanceerde informatie"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Avatarbestand openen"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Openen"
 
@@ -949,9 +949,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "De GNOME-cliënt voor Ring.\nRing is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -965,65 +965,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "oproep plaatsen"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "gesprek openen"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Zoek contacten of voer een nummer in"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring-fout"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Kon niet opnieuw verbinding maken met de Ring-daemon (dring).\nRing zal nu afsluiten."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "Herstelt de verborgen status van het hoofdscherm (alleen van toepassing op het primaire proces)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME-cliënt voor Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Wachtwoorden komen niet overeen"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Dit is je Ring-gebruikersnaam.\nDeel hem met je vrienden!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Dit is je Ring-ID.\nDeel hem met je vrienden!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigt."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Bestand versturen"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Let op: dit wijzigt enkel het wachtwoord op dit apparaat."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Huidig wachtwoord"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nieuw wachtwoord"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Bezig met initialiseren…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/nl_BE.po b/po/nl_BE.po
index b9a7a481eac694c6c069ebec53a812d0ee2a4ea5..3e7cb8de5e73da8d559592bb479f32ecd43c30e4 100644
--- a/po/nl_BE.po
+++ b/po/nl_BE.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Dutch (Belgium) (http://www.transifex.com/savoirfairelinux/ring/language/nl_BE/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "Account migreren"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Account verwijderen"
 
@@ -139,23 +139,23 @@ msgid "Welcome to"
 msgstr "Welkom bij"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Ring-account aanmaken"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Ne Ring-account aanmaken (voor nieuwe gebruikers)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Dit apparaat aan nen account koppelen"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Dit apparaat koppelen aan ne Ring-account aangemaakt op een ander apparaat"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Annuleren"
 
@@ -176,11 +176,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Voor dit apparaat aan nen anderen account te koppelen hebd ge twee mogelijkheden. Ge kund uwen account importeren uit den DHT, maar eerst moet g’een pincode verkrijgen. Ga’ voor de pincode te genereren naar d’accountbeheerinstellingen van een vorig apparaat, kiesd de Ring-account die ge wild gebruiken en selecteerd ‘Een ander apparaat aan dezen account koppelen’. Ge ga’ de pincode krijgen die ge nodig hebd voor dit proces te voltooien. De pincode is slechts 10 minuten geldig. Ge kund uwen account ook rechtstreeks uit een archiefbestand importeren."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -217,10 +217,10 @@ msgstr "Registreer gebruikersnaam"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Als ge dit aanvinkt ga’ ge nen unieke gebruikersnaam op het Ring-netwerk registreren. Andere personen kunnen deze gebruikersnaam gebruiken voor u te bellen, ipv uwe 40 tekens lange Ring-ID."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -234,13 +234,13 @@ msgid ""
 "devices to your account."
 msgstr "Dit paswoord word gebruikt voor uw accountgegevens te versleutelen en nieuwe apparaten aan uwen account te koppelen."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Bevestigd paswoord"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Uw Ring-account wordt aangemaakt..."
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -251,8 +251,8 @@ msgid "This may take a few minutes."
 msgstr "Dit kan enkele minuten duren."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Uw Ring-account wordt opgehaald..."
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "Oké"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring-instellingen"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Ring opstarten bij het aanmelden"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Ring-pictogram weergeven in de meldingen (systeemvak)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Ring naar voorgrond brengen bij inkomende oproepen."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "Algemeen"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -409,10 +409,10 @@ msgstr "Nieuw apparaat toevoegen"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "Voor een nieuw apparaat aan uwe Ring-account toe te voegen, moet g’uwen account exporteren naar de Ring. Dit zal een pincode genereren die ge binnen de 5 minuten op uw nieuw apparaat moet invoeren."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr "Voerd het archiefpaswoord in"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Exporteren naar de Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Account exporteren"
 
@@ -468,8 +468,8 @@ msgid "Voicemail"
 msgstr "Gesproken berichten"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Gekende apparaten gekoppeld aan deze Ring-account"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -735,19 +735,19 @@ msgstr "Selectie instellen als afbeelding"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Kan nie initialiseren.\nZorgd da’ de Ring-daemon (dring) word uitgevoerd.\nFout: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring-fout"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Ring tonen"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr "Kiesd downloadmap"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Annuleren"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "Op_slaan"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Slecht paswoord"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Netwerkfout, probeerd het opnieuw"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Kon export naar de Ring nie initialiseren, probeerd het opnieuw"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Paswoord wijzigen"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Bestand opslaan"
 
@@ -849,13 +849,13 @@ msgstr "Bestand opslaan"
 msgid "File exported to destination: "
 msgstr "Bestand g’exporteerd naar locatie:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr "Onjuist paswoord"
 msgid "Save name"
 msgstr "Naam opslaan"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Apparaat terugtrekken"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr "Paswoord tonen"
 msgid "Voicemail number"
 msgstr "Voicemailnummer"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "_Schermruimte delen"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Beeldscher_m delen"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Bes_tand streamen"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Toond geavanceerde informatie"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Avatarbestand openen"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Openen"
 
@@ -949,9 +949,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Den GNOME-cliënt voor Ring.\nRing is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigd."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -965,65 +965,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "oproep plaatsen"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "gesprek openen"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Zoekt contacten of voerd een nummer in"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Inkomende oproep"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring-fout"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Kon nie opnieuw verbinding maken me’ de Ring-daemon (dring).\nRing zal nu afsluiten."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "Herstelt de verborgen status van het hoofdscherm (alleen van toepassing op het primaire proces)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME-cliënt voor Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Paswoorden komen nie overeen"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Dit is uwe Ring-gebruikersnaam.\nDeeld hem met uw vrienden!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Dit is uwe Ring-ID.\nDeeld hem met uw vrienden!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring is vrije software voor universele communicatie, die de vrijheden en privacy van haar gebruikers eerbiedigd."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Bestand versturen"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Bewerk naam"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Let op: dit wijzigd enkel het paswoord op dit apparaat."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Huidig paswoord"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nieuw paswoord"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Onbekende fout"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Bezig met initialiseren…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Aan het verbinden..."
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Onbekende status"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "geen paswoord ingesteld"
diff --git a/po/nl_NL.po b/po/nl_NL.po
index a4de846efa28163955714e02defcc807278dd7a7..be51d772e8233cfa8a0c25b119fe3f94a0f3c72f 100644
--- a/po/nl_NL.po
+++ b/po/nl_NL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Dutch (Netherlands) (http://www.transifex.com/savoirfairelinux/ring/language/nl_NL/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -137,11 +137,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -149,11 +149,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr ""
 
@@ -174,7 +174,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -232,12 +232,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -249,7 +249,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -262,19 +262,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -337,7 +337,7 @@ msgstr "Algemeen"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Instellingen"
 
@@ -407,8 +407,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -421,11 +421,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -440,7 +440,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -466,7 +466,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -733,18 +733,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -792,7 +792,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -847,13 +847,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -873,11 +873,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -901,35 +901,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -947,8 +947,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -963,64 +963,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 378062ab07855fb8fdd227d9e90724b37f8a8578..8dbbc9503348ffe5b16175ede751c0e231c33f79 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Polish (http://www.transifex.com/savoirfairelinux/ring/language/pl/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr "Przenieś konto"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Usuń konto"
 
@@ -138,23 +138,23 @@ msgid "Welcome to"
 msgstr "Witaj!"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Stwórz konto Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Stwórz nowe konto Ring (dla nowych użytkowników)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Połącz to urządzenie z kontem"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Połącz to urządzenie z kontem Ring stworzonym na innym urządzeniu"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Anuluj"
 
@@ -175,11 +175,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "By połączyć to urządzenie z innym kontem, masz dwie możliwości. Możesz zaimportować swoje konto z DHT(z sieci rozproszonej), ale najpierw musisz wygenerować kod PIN. Aby wygenerować kod PIN, przejdź do ustawień zarządzania kontem na wcześniejszym urządzeniu, wybierz konto Ring i zaznacz \"Połącz inne urządzenie z tym kontem\". Otrzymasz wtedy kod PIN potrzebny do wypełnienia tego formularza, który jest ważny przez 10 minut. Druga możliwość polega na zaimportowaniu pliku z kontem."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -216,10 +216,10 @@ msgstr "Zarejestruj nazwę użytkownika"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Zaznaczając to, rejestrujesz niepowtarzalną nazwę użytkownika w sieci Ring. Użytkownicy mogą korzystać z niej aby kontaktować się z tobą zamiast korzystać z twojego RingID które ma 40 znaków."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -233,13 +233,13 @@ msgid ""
 "devices to your account."
 msgstr "To hasło będzie używane do zaszyfrowania danych twojego konta i do łączenia nowych urządzeń do konta."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Potwierdź hasło"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Stwórz własne konto Ring..."
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -250,8 +250,8 @@ msgid "This may take a few minutes."
 msgstr "To może potrwać kilka minut."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Odzyskiwanie twojego konta Ring..."
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -263,20 +263,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ustawienia Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Zacznij Ring przy logowaniu"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Pokaż ikonę Ring w pasku powiadomień (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Przenieś Ring na pierwszy plan przy połączeniach przychodzących."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -338,7 +338,7 @@ msgstr "Generalne"
 msgid "Media"
 msgstr "Multimedia"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Ustawienia"
 
@@ -408,10 +408,10 @@ msgstr "Dodaj nowe urządzenie"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -422,12 +422,12 @@ msgid "Enter archive password"
 msgstr "Wpisz hasło do archiwum"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Wyeksportuj konto Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Eksportowanie konta Ring..."
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -441,7 +441,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Kliknij by zmienić hasło"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Wyeksportuj konto"
 
@@ -467,8 +467,8 @@ msgid "Voicemail"
 msgstr "Poczta głosowa"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Znane urządzenia połączone z tym kontem Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -734,19 +734,19 @@ msgstr "Ustaw zaznaczenie jako obrazek"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Nie udało się uruchomić.\nUpewnij się że daemon Ring (dring) jest uruchomiony.\nBłąd: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Błąd Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Pokarz Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -793,8 +793,8 @@ msgid "Performing lookup…"
 msgstr "Wyszukiwanie..."
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Wpisz hasło do twojego konta Ring"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -811,36 +811,36 @@ msgid "Choose download folder"
 msgstr "Wybierz folder pobierania"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Anuluj"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Zapisz"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Złe hasło"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Błąd sieci, spróbuj ponownie"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Nie udało się wyeksportować, spróbuj później"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Zmień hasło"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Zapisz plik"
 
@@ -848,13 +848,13 @@ msgstr "Zapisz plik"
 msgid "File exported to destination: "
 msgstr "Plik został wyeksportowany do: "
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Uwaga! Ta operacja usunie to urządzenie!\nNie można tego cofnąć."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Wprowadź hasło, aby usunąć urządzenie"
 
@@ -874,11 +874,11 @@ msgstr "Niepoprawne hasło"
 msgid "Save name"
 msgstr "Zapisz nazwę"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Odwołaj urządzenie"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Błąd podczas usuwania urządzenia"
 
@@ -902,35 +902,35 @@ msgstr "Pokaż hasło"
 msgid "Voicemail number"
 msgstr "Numer poczty głosowej"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Błąd: złe hasło!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Błąd: nieznane urządzenie!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Udostępnij _obszar ekranu"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Udostępnij _ekran"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Prześlij _plik"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Pokaż zaawansowane informacje"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Otwórz obraz awatara"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -948,9 +948,9 @@ msgstr "\"Live Free or Die\"\nzbudowano %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ring jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników"
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -964,65 +964,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Dodaj konto..."
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "Zadzwoń"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "Otwórz chat"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Szukaj kontakty lub wpisz numer"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Opuść stronę ustawień"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "dzwoni do Ciebie!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Połączenie przychodzące"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Nowe zaproszenie od"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Rządanie zaufania"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Nowa wiadomość"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Błąd Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Próba połączenia z daemonem Ring (dring)..."
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Nie udało się ponownie połączyć z daemonem Ring (dring).\nRing się teraz wyłączy."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1075,116 +1075,110 @@ msgid ""
 msgstr "Przywraca ukryty stan głównego okna (dotyczy tylko pierwszej instancji aplikacji)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Klient GNOME dla Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Hasła nie pasują"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "To jest twoja nazwa użytkownika Ring.\nSkopiuj i podziel się nią z przyjaciółmi!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "To jest twój RingID. Skopiuj i podziel go ze swoimi przyjaciółmi!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring jest wolnym oprogramowaniem do uniwersalnej komunikacji, respektującym wolności i prywatność swoich użytkowników"
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Wyślij plik"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Uwaga! Ta operacja usunie to urządzenie!\nNie można tego cofnąć. Jeżeli usuwasz swoje jedyne urządzenie, możesz utracić zarejestrowaną nazwę!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automatycznie"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Edytuj nazwę"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Odblokuj"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Nowe hasło i jego potwierdzenie się różnią!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Niepoprawne hasło!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Uwaga: to zmieni hasło tylko na tym urządzeniu."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Bieżące hasło"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nowe hasło"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Konto wyeksportowane!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Błąd podczas eksportowania"
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Nieoczekiwany błąd"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Inicjalizacja..."
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Łączenie..."
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Nieznany status"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "nie ustawiono hasła"
diff --git a/po/pt.po b/po/pt.po
index 283456d51ab47ba6af762ad8b06757332e491f58..91f66017a259c759273118a47042b912a15ecd92 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Portuguese (http://www.transifex.com/savoirfairelinux/ring/language/pt/)\n"
 "MIME-Version: 1.0\n"
@@ -55,7 +55,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -138,11 +138,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -150,11 +150,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr ""
 
@@ -175,7 +175,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -216,7 +216,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -233,12 +233,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -250,7 +250,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -263,20 +263,20 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Iniciar o Ring com o sistema"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Trazer o Ring para o primeiro plano quando houver chamadas"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -338,7 +338,7 @@ msgstr "Geral"
 msgid "Media"
 msgstr "Mídia"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Configurações"
 
@@ -408,8 +408,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -422,11 +422,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -441,7 +441,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -467,7 +467,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -734,18 +734,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -793,7 +793,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -811,36 +811,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -848,13 +848,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -874,11 +874,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -902,35 +902,35 @@ msgstr "Exibir senha"
 msgid "Voicemail number"
 msgstr "Número do correio de voz"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -948,8 +948,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -964,64 +964,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Pesquise pelo nome ou número"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Chamada entrante"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1075,116 +1075,110 @@ msgid ""
 msgstr "Restaurar janela principal (somente para a primeira instância)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Cliente GNOME para Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Este é seu RingID.\nCopie e avise seus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nova password"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 2d30ea0ab69a52e8df4c971ec424629d32af95f6..a98790a704062a0e773f330ef0d29ae0179533c6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/savoirfairelinux/ring/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
@@ -68,7 +68,7 @@ msgstr "Migrar conta"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Deletar conta"
 
@@ -151,23 +151,23 @@ msgid "Welcome to"
 msgstr "Bem-vindo à"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Criar conta Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Criar nova conta Ring (para novos usuários)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Associar este dispositivo a uma conta"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Associar estes dispositivos à uma conta Ring criada em outro dispositivo."
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -188,11 +188,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Para conectar estes dispositivo a outra conta, você tem duas opções. Você pode importar sua conta do DHT, mas primeiro, você precisará obter um código PIN. Para gerar um código PIN, vá no gerenciamento de configurações da conta do seu outro dispositivo, escolha a conta Ring que deseja usar e selecione \"Associar outro dispositivo à esta conta\" e você irá receber o PIN necessário para completar este formulário. O PIN é válido por apenas 10 minutos. Ou, você pode importar sua conta diretamente a partir de um backup."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -229,10 +229,10 @@ msgstr "Registrar nome de usuário"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Ao confirmar esta opção, você irá registrar um nome de usuário único na rede Ring. Pessoas poderão usá-lo para lhe contactar ao invés de usar o seu RingID, que possui uma sequência de 40 caracteres."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -246,13 +246,13 @@ msgid ""
 "devices to your account."
 msgstr "Esta senha irá ser usada para encriptar os dados da sua conta e para ligar novos dispositivos a esta conta."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confirmar senha"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Gerando sua conta Ring…"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -263,8 +263,8 @@ msgid "This may take a few minutes."
 msgstr "Isso pode levar alguns minutos."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Obtendo sua conta Ring…"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -276,20 +276,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Configuração do Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Iniciar Ring durante o login"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Mostrar ícone do Ring na área de notificação (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Trazer Ring para o primeiro plano ao receber chamadas."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -351,7 +351,7 @@ msgstr "Geral"
 msgid "Media"
 msgstr "Mídia"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Configurações"
 
@@ -421,10 +421,10 @@ msgstr "Adicionar novo dispositivo"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -435,12 +435,12 @@ msgid "Enter archive password"
 msgstr "Digite a senha do arquivo"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Exportar no Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Exportando conta no Ring…"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -454,7 +454,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Clique para mudar a senha"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Exportar conta"
 
@@ -480,8 +480,8 @@ msgid "Voicemail"
 msgstr "Correio de voz"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Dispositivos conhecidos conectados à esta conta Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -747,19 +747,19 @@ msgstr "Configurar seleção como imagem"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Não foi possível iniciar.\nCertifique-se que o processo Ring (dring) está sendo executado.\nErro: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Erro do Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Exibir Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -806,8 +806,8 @@ msgid "Performing lookup…"
 msgstr "Efetuando procura…"
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Introduza sua senha de sua conta Ring"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -824,36 +824,36 @@ msgid "Choose download folder"
 msgstr "Escolha a pasta de arquivos baixados"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Salvar"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Senha incorreta"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Erro de rede, tente novamente"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Não foi possível iniciar exportação para o Ring, tente novamente"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Mudar senha"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Salvar arquivo"
 
@@ -861,13 +861,13 @@ msgstr "Salvar arquivo"
 msgid "File exported to destination: "
 msgstr "Arquivo exportado ao destino:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Atenção! Esta ação irá revogar o dispositivo!\nNota: esta ação não pode ser desfeita."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Digite a senha para revogar o dispositivo"
 
@@ -887,11 +887,11 @@ msgstr "Senha incorreta"
 msgid "Save name"
 msgstr "Salvar nome"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Revogar dispositivo"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Erro ao revogar o dispositivo"
 
@@ -915,35 +915,35 @@ msgstr "Mostrar senha"
 msgid "Voicemail number"
 msgstr "Número do correio de voz"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Erro: senha incorreta!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Erro: dispositivo desconhecido!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Compartilhar _área da tela"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Compartilhar _monitor"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Transmitir _arquivo"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Mostrar informação avançada"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Abrir Avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -961,9 +961,9 @@ msgstr "\"Viva Livre ou Morra\"\ndesenvolvido em %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "O cliente GNOME para Ring.\nRing é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -977,65 +977,65 @@ msgstr "Pare de gravar"
 msgid "Send recorded message"
 msgstr "Enviar mensagem gravada"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Adicionar conta…"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fazer ligação"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "abrir chat"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Busque por contatos ou insira o número"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Deixar a página de configurações"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "está chamando você!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Chamada recebida"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Nova requisição de"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Confiar na requisição"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Nova mensagem"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Erro do Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Tentando reconectar ao processo daemon Ring (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Não foi possível reconectar ao daemon Ring (drink) .%s\nRing vai agora parar."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1088,116 +1088,110 @@ msgid ""
 msgstr "Restaurar o estado oculto da janela principal (aplicável apenas à primeira instância)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- cliente GNOME para o Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Senhas não condizentes"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Este é o seu nome de usuário no Ring.\nCopie-o e o compartilhe com seus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Este é o seu RingID.\nCopie e compartilhe com seus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring é um software livre para comunicação universal que respeita as liberdades e privacidade de seus usuários."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "Código QR do RingID"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Enviar arquivo"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Atenção! Esta ação irá remover esta conta deste dispositivo!\nNota: esta ação não pode ser desfeita. Além disso, seu nome registrado pode ser perdido!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automático"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Cancelar banimento"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "A nova senha e a sua confirmação não coincidem!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Senha incorreta!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Nota: isto irá mudar a senha apenas deste dispositivo."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Senha atual"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nova senha"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Conta exportada!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Falha ao exportar a conta."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Iniciando..."
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Offline"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Conectando…"
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Online"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Status desconhecido"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "Nenhuma senha definida"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index c3108565e096b299638b67a66348da525c037e3f..caed806c0423f511523ac81b2e73f4bf94027bbe 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Portuguese (Portugal) (http://www.transifex.com/savoirfairelinux/ring/language/pt_PT/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "Migrar conta"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Eliminar conta"
 
@@ -137,23 +137,23 @@ msgid "Welcome to"
 msgstr "Bem-vindo(a) à"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Criar Conta Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Criar nova conta Ring (para novos utilizadores)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Associar este dispositivo a uma conta"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Associar estes dispositivos uma conta Ring criada noutro dispositivo"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Cancelar"
 
@@ -174,11 +174,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Para conectar estes dispositivo a outra conta, tem duas opções. Pode importar a sua conta do DHT, mas primeiro, necessitará de obter um código PIN. Para gerar um código PIN, aceda à gestão de configurações da conta do dispositivo anterior, escolha a conta Ring que deseja usar e selecione \"Associar outro dispositivo a esta conta\" e irá receber o PIN necessário para completar este formulário. O PIN é válido por apenas 10 minutos. Ou pode importar a sua conta diretamente a partir de uma cópia de segurança."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -215,10 +215,10 @@ msgstr "Registar nome de utilizador"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Ao confirmar esta opção, irá registar um nome de utilizador único na rede Ring. As pessoas poderão usá-lo para o contactar em vez de usarem o seu RingID, que possui uma sequência de 40 caracteres."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -232,13 +232,13 @@ msgid ""
 "devices to your account."
 msgstr "Esta palavra-chave irá ser usada para encriptar os dados da sua conta e para ligar novos dispositivos à sua conta."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confirmar palavra-chave"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "A gerar a sua conta Ring…"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -249,8 +249,8 @@ msgid "This may take a few minutes."
 msgstr "Isto pode levar alguns minutos."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Obtendo a sua conta Ring…"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -262,20 +262,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Configuração do Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Executar o Ring ao entrar na conta"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Mostrar ícone do Ring na área de notificação (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Trazer o Ring para o primeiro plano ao receber chamadas."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -337,7 +337,7 @@ msgstr "Geral"
 msgid "Media"
 msgstr "Média"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Configurações"
 
@@ -407,10 +407,10 @@ msgstr "Adicionar Novo Dispositivo"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -421,12 +421,12 @@ msgid "Enter archive password"
 msgstr "Introduza a palavra-chave do arquivo"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Exportar no Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "A exportar conta no Ring…"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -440,7 +440,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Clique para mudar a palavra-chave"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Exportar conta"
 
@@ -466,8 +466,8 @@ msgid "Voicemail"
 msgstr "Correio de voz"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Dispositivos conhecidos associados a esta conta Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -733,19 +733,19 @@ msgstr "Definir seleção como imagem"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Não foi possível iniciar.\nCertifique-se que o processo Ring (dring) está a ser executado.\nErro: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Erro do Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Mostrar Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -792,8 +792,8 @@ msgid "Performing lookup…"
 msgstr "A pesquisar…"
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Introduza a palavra-chave da sua conta Ring"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr "Escolher a pasta de ficheiros descarregados"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Cancelar"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Gravar"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Palavra-chave incorreta"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Erro de rede, tente novamente"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Não foi possível iniciar exportação para o Ring, tente novamente."
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Alterar palavra-chave"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Gravar Ficheiro"
 
@@ -847,13 +847,13 @@ msgstr "Gravar Ficheiro"
 msgid "File exported to destination: "
 msgstr "Ficheiro exportado para o destino:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Atenção! Esta ação irá revogar o dispositivo!\nNota: esta ação não pode ser desfeita."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Digite a palavra-chave para revogar o dispositivo"
 
@@ -873,11 +873,11 @@ msgstr "Palavra-chave incorreta"
 msgid "Save name"
 msgstr "Gravar nome"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Revogar dispositivo"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Erro ao revogar o dispositivo"
 
@@ -901,35 +901,35 @@ msgstr "Mostrar palavra-chave"
 msgid "Voicemail number"
 msgstr "Número do correio de voz"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Erro: palavra-chave incorreta!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Erro: dispositivo desconhecido!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Partilhar _área do ecrã"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Partilhar _monitor"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Transmitir _ficheiro"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Mostrar informação avançada"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Abrir Avatar"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -947,9 +947,9 @@ msgstr "\"Viva Livre ou Morra\"\ndesenvolvido em %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "O cliente GNOME para o Ring.\nO Ring é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -963,65 +963,65 @@ msgstr "Parar de gravar"
 msgid "Send recorded message"
 msgstr "Enviar mensagem gravada"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Adicionar conta…"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "fazer chamada"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "abrir conversa"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Pesquisar contactos ou introduza o número"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Deixar página de configurações"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "está a telefonar-lhe!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Chamada recebida"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Novo pedido de"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Confiar no pedido"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Nova mensagem"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Erro do Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "A tentar reconectar ao processo daemon Ring (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Não foi possível reconectar ao daemon Ring (drink) .%s\nO Ring vai agora desligar-se."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr "Restaura o estado oculto da janela principal (aplicável apenas à primeira instância)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- cliente GNOME para o Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "As palavras-chave não são iguais"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Este é o seu nome de utilizador no Ring.\nCopie e o partilhe-o com os seus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Este é o seu RingID.\nCopie e partilhe com os seus amigos!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "O Ring é um programa livre para comunicação universal que respeita as liberdades e privacidade dos seus utilizadores."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "Código QR do RingID"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Enviar Ficheiro"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Atenção! Esta ação irá remover esta conta neste dispositivo!\nNota: esta ação não pode ser desfeita. Além disso, pode perder o seu nome registado!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Automático"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Editar nome"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Desbanir"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "A nova palavra-chave e a sua confirmação são diferentes!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Palavra-chave incorreta!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Nota: isto irá mudar a palavra-chave apenas neste dispositivo."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Palavra-chave atual"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nova palavra-chave"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "A conta foi exportada!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Falha ao exportar a conta."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Erro desconhecido"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "A inicializar..."
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Desligado"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "A conectar…"
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Ligado"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Estado desconhecido"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "nenhuma palavra-chave definida"
diff --git a/po/ring-client-gnome.pot b/po/ring-client-gnome.pot
index 749810a2c034bd039b4f6db2c04e325c698a6f01..9f169b2675d0f786bc13b6df6bb57e3ec88d9189 100644
--- a/po/ring-client-gnome.pot
+++ b/po/ring-client-gnome.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -135,11 +135,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -147,11 +147,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr ""
 
@@ -172,7 +172,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous "
-"device, choose the Ring Account to use and select \"Link another device to "
+"device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -213,7 +213,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -230,12 +230,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -247,7 +247,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -260,19 +260,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -335,7 +335,7 @@ msgstr ""
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr ""
 
@@ -405,8 +405,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -419,11 +419,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -438,7 +438,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -464,7 +464,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -731,18 +731,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -790,7 +790,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -808,36 +808,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -845,13 +845,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -871,11 +871,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -899,35 +899,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -945,8 +945,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the "
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
@@ -962,64 +962,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the "
 "layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1073,116 +1073,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/ro.po b/po/ro.po
index e7f35f764071f1eef1b97cab6316ed0910072f8e..cf28cc8d5df42e2ff00332f00048adc1b08baedb 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Romanian (http://www.transifex.com/savoirfairelinux/ring/language/ro/)\n"
 "MIME-Version: 1.0\n"
@@ -53,7 +53,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -136,11 +136,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -148,11 +148,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr ""
 
@@ -173,7 +173,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -214,7 +214,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -231,12 +231,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Confirmă parola"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -248,7 +248,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -261,19 +261,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -336,7 +336,7 @@ msgstr "General"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Setari"
 
@@ -406,8 +406,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -420,11 +420,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -439,7 +439,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -465,7 +465,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -732,18 +732,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -791,7 +791,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -809,36 +809,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -846,13 +846,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -872,11 +872,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -900,35 +900,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -946,8 +946,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -962,64 +962,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Apel de intrare"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1073,116 +1073,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring este un software gratuit pentru comunicații universale care respectă libertățile individuale și dorința de anonimitate a utilizatorilor."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Parolă nouă"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/ru.po b/po/ru.po
index 14789895800e5daa82412dd1159eb581d8939c31..2d790bf2e7fb8092c21b925098458c7ccda52a12 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -23,8 +23,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Russian (http://www.transifex.com/savoirfairelinux/ring/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -69,7 +69,7 @@ msgstr "Перенести аккаунт"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Удалить аккаунт"
 
@@ -152,23 +152,23 @@ msgid "Welcome to"
 msgstr "Добро пожаловать в"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Создать аккаунт Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Создать новый аккаунт Ring (для новых пользователей)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Привязать это устройство к аккаунту"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Привязать это устройство к аккаунту Ring, созданному на другом устройстве"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -189,11 +189,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Чтобы привязать это устройство к другому аккаунту, у вас есть две возможности. Первая состоит в том, чтобы передать данные вашего аккаунта через DHT. Для этого необходим PIN-код, получить который можно в настройках управления акккаунтом предыдущего устройства. Выберите необходимый аккаунт и нажмите \"Привязать другое устройство к этому аккаунту\". Полученный PIN-код будет действителен в течение 10 минут. Либо, вы можете импортировать ваш аккаунт напрямую из архива."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -230,10 +230,10 @@ msgstr "Зарегистрировать имя пользователя"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Отмечая это, вы зарегистрируете уникальное имя в сети Ring. Другие пользователи смогут использовать его для связи с вами вместо RingID, который 40 символов длиной."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -247,13 +247,13 @@ msgid ""
 "devices to your account."
 msgstr "Этот пароль будет использован для шифрования данных вашего аккаунта и для привязки новых устройств к вашему аккаунту."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Создание вашего аккаунта Ring…"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -264,8 +264,8 @@ msgid "This may take a few minutes."
 msgstr "Это может занять несколько минут."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Загрузка вашего аккаунта Ring…"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -277,20 +277,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Настройки Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Автоматически запускать Ring при входе в систему"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Показывать значок Ring в области уведомлений (трее)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Выводить Ring на передний план при входящем звонке."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -352,7 +352,7 @@ msgstr "Общие"
 msgid "Media"
 msgstr "Медиа"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Настройки"
 
@@ -422,10 +422,10 @@ msgstr "Добавить новое устройство"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "Для привязки нового устройства к вашему аккаунту Ring вам нужно экспортировать ваш аккаунт в сеть Ring. Это сгенерирует PIN код, который потребуется ввести на вашем новом устройстве в течение 5 минут с момента его генерации."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -436,12 +436,12 @@ msgid "Enter archive password"
 msgstr "Введите пароль архива"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Экспорт в сеть Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Экспорт аккаунта в сеть Ring…"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -455,7 +455,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Нажмите для изменения пароля"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Экспортировать аккаунт"
 
@@ -481,8 +481,8 @@ msgid "Voicemail"
 msgstr "Голосовая почта"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Устройства, привязанные к этому аккаунту Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -748,19 +748,19 @@ msgstr "Установить выбранное в качестве изобра
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Инициализация не выполнена.\nУбедитесь, что демон Ring (dring) запущен.\nОшибка: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ошибка Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Показать Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -807,8 +807,8 @@ msgid "Performing lookup…"
 msgstr "Проверяется занятость…"
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Введите пароль вашей учётной записи Ring"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -825,36 +825,36 @@ msgid "Choose download folder"
 msgstr "Выберите папку для загрузок"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Отмена"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Сохранить"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Недопустимый пароль"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Ошибка сети, попробуйте снова"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Не удалось инициировать экспорт в Ring, попробуйте снова"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Изменить пароль"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Сохранить файл"
 
@@ -862,13 +862,13 @@ msgstr "Сохранить файл"
 msgid "File exported to destination: "
 msgstr "Файл экспортирован в:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Предупреждение! Это действие отзовёт устройство!\nЗамечание: это действие невозможно отменить."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Введите пароль, чтобы отозвать устройство"
 
@@ -888,11 +888,11 @@ msgstr "Неверный пароль"
 msgid "Save name"
 msgstr "Сохранить имя"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Отозвать устройство"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Ошибка при отзыве устройства"
 
@@ -916,35 +916,35 @@ msgstr "Показать пароль"
 msgid "Voicemail number"
 msgstr "Номер голосовой почты"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Ошибка: неверный пароль!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Ошибка: неизвестное устройство!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Показать _область экрана"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Показать _экран"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Транслировать _файл"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Показать дополнительную информацию"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Открыть изображение аватара"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -962,9 +962,9 @@ msgstr "\"Live Free or Die\"\nсобрано %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Клиент GNOME для Ring.\nRing — это свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -978,65 +978,65 @@ msgstr "Остановить запись"
 msgid "Send recorded message"
 msgstr "Отправить записанное сообщение"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Добавить аккаунт…"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "позвонить"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "открыть чат"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Найдите контакты или введите номер"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Выйти из настроек"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "звони́т вам!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Входящий звонок"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Новый запрос от"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Новое сообщение"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ошибка Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Пробуем переподключиться к демону Ring (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Не удалось переподключиться к демону Ring (dring).\nЗавершение работы Ring."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1089,116 +1089,110 @@ msgid ""
 msgstr "Восстанавливает скрытое состояние главного окна (только для первичного процесса)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- клиент GNOME для Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Пароли не совпадают"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Это ваше имя пользователя Ring.\nСкопируйте и поделитесь им со своими друзьями!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Это ваш RingID.\nСкопируйте и поделитесь им с вашими друзьями!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring — это свободная программа для связи, уважающая свободу и конфиденциальность пользователей."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "RingID QR код"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Отправить файл"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Предупреждение! Это действие удалит данный аккаунт на данном устройстве!\nЗамечание: это действие невозможно отменить. Также вы можете потерять зарегистрированное имя!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авто"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Редактировать имя"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Разблокировать"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Новый пароль и его подтверждение не совпадают!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Неверный пароль!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Замечание: это изменит пароль только на данном устройстве."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Текущий пароль"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Новый пароль"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Аккаунт экспортирован!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Экспорт аккаунта не выполнен."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Инициализация…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Не в сети"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Соединение…"
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "В сети"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Неизвестный статус"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "пароль не установлен"
diff --git a/po/ru_RU.po b/po/ru_RU.po
index 2052bf71b1cfc635bd26e5e57792fc98ec5d6375..37fa29e193e3c4786749804065a00bbad6ef58c5 100644
--- a/po/ru_RU.po
+++ b/po/ru_RU.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/savoirfairelinux/ring/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -151,11 +151,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Отмена"
 
@@ -176,7 +176,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -217,7 +217,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Подтверждение пароля"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,19 +264,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Настройки \"Ring\""
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Запускать \"Ring\" при входе в систему"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Показать значок \"Ring\" в области уведомлений (системном трее)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -339,7 +339,7 @@ msgstr "Основные"
 msgid "Media"
 msgstr "Медиа"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Настройки"
 
@@ -409,8 +409,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr "Введите пароль архива"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -468,7 +468,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -735,18 +735,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Сохранить файл"
 
@@ -849,13 +849,13 @@ msgstr "Сохранить файл"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr "Номер голосовой почты"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -949,8 +949,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -965,64 +965,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Входящий вызов"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr " - клиент GNOME для Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Автоматически"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Новый пароль"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/sk_SK.po b/po/sk_SK.po
index 0d2885457dccca6734b46214c9d886c10b274aa0..015aeb87713a54d15e3ba2ab8fd9c9d6077acc74 100644
--- a/po/sk_SK.po
+++ b/po/sk_SK.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Slovak (Slovakia) (http://www.transifex.com/savoirfairelinux/ring/language/sk_SK/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -137,11 +137,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -149,11 +149,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Zruš"
 
@@ -174,7 +174,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -232,12 +232,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -249,7 +249,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -262,19 +262,19 @@ msgid "OK"
 msgstr "Ok"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
+msgid "Start Jami on login"
 msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -337,7 +337,7 @@ msgstr "Všeobecné"
 msgid "Media"
 msgstr ""
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Nastavenie"
 
@@ -407,8 +407,8 @@ msgstr "Pridaj nové zariadenie"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -421,11 +421,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -440,7 +440,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -466,7 +466,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -733,18 +733,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -792,7 +792,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr ""
 
@@ -847,13 +847,13 @@ msgstr ""
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -873,11 +873,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -901,35 +901,35 @@ msgstr ""
 msgid "Voicemail number"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -947,8 +947,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -963,64 +963,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
+msgid "- GNOME client for Jami"
 msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 66f9dc1b3a8f2b48a660a5a8f8af9986eefd9dfa..17bd5d8844443352c7c9e10fd5076896ce436cb2 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Slovenian (http://www.transifex.com/savoirfairelinux/ring/language/sl/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "Migriraj račun"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Pobriši račun"
 
@@ -137,23 +137,23 @@ msgid "Welcome to"
 msgstr "Dobrodošli v"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Ustvari Ring račun"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Ustvari nov Ring račun (za nove uporabnike)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Poveži to napravo k računu"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Poveži to napravo k Ring računu ustvarjenem na drugi napravi"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Prekliči"
 
@@ -174,7 +174,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -215,7 +215,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -232,12 +232,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Potrdi geslo"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -249,7 +249,7 @@ msgid "This may take a few minutes."
 msgstr "To lahko traja nekaj minut."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -262,19 +262,19 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Nastavitve Ring računa"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Zaženi Ring ob prijavi"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -337,7 +337,7 @@ msgstr "Splošno"
 msgid "Media"
 msgstr "Mediji"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Nastavitve"
 
@@ -407,10 +407,10 @@ msgstr "Dodaj novo napravo"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -421,11 +421,11 @@ msgid "Enter archive password"
 msgstr "Vnesi arhivsko geslo"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Izvozi v Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -440,7 +440,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -466,8 +466,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Poznane naprave povezane s tem Ring računom"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -733,18 +733,18 @@ msgstr "Določi izbrano za sliko"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring napaka"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -792,7 +792,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Prekliči"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Neveljavno geslo"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Napaka mreže. Prosim poskusi ponovno."
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Shrani datoteko"
 
@@ -847,13 +847,13 @@ msgstr "Shrani datoteko"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -873,11 +873,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Odpokliči napravo"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -901,35 +901,35 @@ msgstr "Prikaži geslo"
 msgid "Voicemail number"
 msgstr "Številka glasovnega predala"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Prikaži napredne informacije"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Odpri avatar sliko"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Odpri"
 
@@ -947,9 +947,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "GNOME klient za Ring.\nRing je zastonj programska oprema za univerzalno komunikacijo, ki spoštuje svoboščine in zasebnost uporabnikov."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -963,64 +963,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "izvedi klic"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "odpri pogovor"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Poišči stik ali vnesi številko"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Dohodni klic"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring napaka"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME klient za Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Gesli nista enaki"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "To je tvoj RingID.\nKopiraj in deli s svojimi prijatelji!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring je zastonj programska oprema za univerzalno komunikacijo, ki spoštuje svoboščine in zasebnost uporabnikov."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Samodejno"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Novo geslo"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Odjavljen"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Povezan"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/sq_AL.po b/po/sq_AL.po
index b4f79f5fde718c8a363db2d6c8cade60940e021c..22baf02ff60f2048e5e8bbc3c94579898c553abb 100644
--- a/po/sq_AL.po
+++ b/po/sq_AL.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Albanian (Albania) (http://www.transifex.com/savoirfairelinux/ring/language/sq_AL/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "Migroni llogari"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Fshije llogarinë"
 
@@ -137,23 +137,23 @@ msgid "Welcome to"
 msgstr "Mirë se vini te"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Krijoni Llogari Ring"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Krijoni një llogari të ri Ring (për përdorues të rinj)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Lidheni këtë pajisje me një llogari"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Lidheni këtë pajisje me një llogari Ring të krijuar te pajisja tjetër"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Anuloje"
 
@@ -174,11 +174,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "Për të lidhur këtë pajisje me një llogari tjetër, keni dy mundësi. Mund të importoni llogarinë tuaj nga DHT, por së pari, lypset të merrni një kod PIN. Që të prodhohet kodi PIN, kaloni te ndarja e administrimit të llogarive, te pajisja e mëparshme, zgjidhni Llogari Ring që duhet përdorur dhe përzgjidhni \"Lidhni me këtë llogari një pajisje tjetër\". Do të merrni PIN-in e nevojshëm për të plotësuar këtë formular. PIN-i vlen vetëm për 10 minuta. Ose mund të importoni drejtpërsëdrejti llogarinë tuaj nga një arkiv."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -215,10 +215,10 @@ msgstr "Regjistroni emër përdoruesi"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Duke i vënë shenjë kësaj, do të regjistroni një emër përdoruesi unik në rrjetin Ring. Njerëzit mund ta përdorin për t’u lidhur me ju, në vend se të ID-së tuaj Ring, që është 40 shenja i gjatë."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -232,13 +232,13 @@ msgid ""
 "devices to your account."
 msgstr "Ky fjalëkalim do të përdoret për të fshehtëzuar të dhënat e llogarisë tuaj dhe për të lidhur pajisje të reja në të."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Ripohoni fjalëkalimin"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Po prodhohet llogaria juaj Ring…"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -249,8 +249,8 @@ msgid "This may take a few minutes."
 msgstr "Kjo mund të hajë pak minuta."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Po merret llogaria juaj Ring…"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -262,20 +262,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Rregullime Ring-u"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Nise Ring-un kur bëni hyrjen në sistem"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Shfaq ikonë Ring-u te fusha e njoftimeve (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Sille Ring-un përpara për thirrje ardhëse."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -337,7 +337,7 @@ msgstr "Të përgjithshme"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Rregullime"
 
@@ -407,10 +407,10 @@ msgstr "Shtoni Pajisje të Re"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -421,12 +421,12 @@ msgid "Enter archive password"
 msgstr "Jepni fjalëkalim arkivi"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Eksportoje te Ring-u"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Po eksportohet llogari në Ring…"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -440,7 +440,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Klikoni që të ndryshohet fjalëkalimi"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Eksportoni llogari"
 
@@ -466,8 +466,8 @@ msgid "Voicemail"
 msgstr "Voicemail"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Pajisje të njohura që lidhen te kjo llogari Ring"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -733,19 +733,19 @@ msgstr "Si figurë cakto përzgjedhjen"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "S’arrihet të gatitet.\nSigurohuni që demoni Ring (dring) është në punë e sipër.\nGabim: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Gabim Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Shfaqe Ring-un"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -792,8 +792,8 @@ msgid "Performing lookup…"
 msgstr "Po kryhet kërkim…"
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Jepni fjalëkalimin për llogarinë tuaj Ring"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr "Zgjidhni dosje shkarkimesh"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Anuloje"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Ruaje"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Fjalëkalim i gabuar"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Gabim rrjeti, riprovoni"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "S’u fillua dot eksportimi te Ring, riprovoni"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Ndryshoni fjalëkalimin"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Ruaje Kartelën"
 
@@ -847,13 +847,13 @@ msgstr "Ruaje Kartelën"
 msgid "File exported to destination: "
 msgstr "Kartela u eksportua te vendmbërritja:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Kujdes! Ky veprim do të shfuqizojë pajisjen!\nShënim: ky veprim s’mund të zhbëhet."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Që të shfuqizohet pajisja, jepni fjalëkalimin"
 
@@ -873,11 +873,11 @@ msgstr "Fjalëkalim i pasaktë"
 msgid "Save name"
 msgstr "Ruaje emrin"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Shfuqizoje pajisjen"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Gabim gjatë shfuqizimit të pajisjes"
 
@@ -901,35 +901,35 @@ msgstr "Shfaqe fjalëkalimin"
 msgid "Voicemail number"
 msgstr "Numër voicemail"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Gabim: fjalëkalim i gabuar!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Gabim: pajisje e panjohur!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Ndani me të tjerë zonë _ekrani"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Ndani me të tjerë _monitor"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "_Kartelë rrjedhe"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Shfaq informacion të thelluar"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Hap Figurë Avatari"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Hape"
 
@@ -947,9 +947,9 @@ msgstr "\"Live Free or Die\"\nngritur mbi %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Klienti Ring për GNOME.\nRing është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -963,65 +963,65 @@ msgstr "Ndale incizimin"
 msgid "Send recorded message"
 msgstr "Dërgo mesazhin e incizuar"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Shtoni llogari…"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "bëni një thirrje"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "hape fjalosjen"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Përzgjidhni kontakte ose jepni një numër"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Braktise faqen e rregullimeve"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "po ju thërret!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Thirrje ardhëse"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Kërkesë e re nga"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Kërkesë besueshmërie"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Mesazh i ri"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Gabim Ring-u"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Përpjekje për t’u rilidhur me demonin Ring (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "S’u rilidh dot me demonin Ring (dring).\nRing-u tani do të dalë."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr "Rikthen gjendjen e fshehur të dritares kryesore (e zbatueshme vetëm për instancën parësore)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Klienti Ring për GNOME"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Fjalëkalimet nuk përputhen"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Ky është emri juaj i përdoruesit në Ring.\nKopjojeni dhe jepuani shokëve!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Kjo është RingID-ja juaj.\nKopjojeni dhe jepuani shokëve!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring është software i lirë për komunikim universal që respekton privatësinë e përdoruesve të tij."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "Kod IQ RingID-je"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Dërgo Kartelë"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Kujdes! Ky veprim do të shkaktojë heqjen e kësaj llogarie në këtë pajisje!\nShënim: ky veprim s’mund të zhbëhet. Veç kësaj, mund të humbë emri që keni regjistruar!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Përpunoni emrin"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Zhdëboje"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Fjalëkalimi i ri dhe ripohimi për të janë të ndryshëm!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Fjalëkalim i pasaktë!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Shënim: kjo do të ndryshojë fjalëkalimi vetëm në këtë pajisje."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Fjalëkalimi i tanishëm"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Fjalëkalim i ri"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Llogaria u eksportua!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Dështim eksportimi llogarie."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Gabim i panjohur"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Po gatitet…"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Jo në linjë"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Po lidhet…"
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Në linjë"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Gjendje e panjohur"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "s’ka fjalëkalim të caktuar"
diff --git a/po/sv.po b/po/sv.po
index bc6fbb66598ef8e5cd5ddeb339f28fe98cf61c43..f038ea8369bb5189dcd09c02755dfa846c3ad473 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Swedish (http://www.transifex.com/savoirfairelinux/ring/language/sv/)\n"
 "MIME-Version: 1.0\n"
@@ -54,7 +54,7 @@ msgstr "Migrera konto"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Ta bort konto"
 
@@ -137,23 +137,23 @@ msgid "Welcome to"
 msgstr "Välkommen till"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Skapa Ring-konto"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Skapa ett nytt Ring-konto (för nya användare)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Koppla denna enhet till ett konto"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Koppla den här enheten till ett Ring-konto, skapat på en annan enhet"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Avbryt"
 
@@ -174,11 +174,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "För att länka denna enhet till ett annat konto, har du två alternativ. Du kan importera ditt konto från DHT, men måste först ha en PIN-kod. För att generera PIN-koden, går du till kontoinställningarna på en tidigare konfigurerad enhet, väljer det Ring-konto du vill använda och \"lägger till en enhet\". Där får du den nödvändiga PIN-koden för att avsluta detta formulär. PIN-koden är giltig i endast 10 minuter. Du kan också direktimportera ditt konto från en arkivfil."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -215,10 +215,10 @@ msgstr "Registrera användarnamn"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Genom att aktivera detta, registrerar du ett unikt användarnamn på Ring-nätverket. Folk kan använda det för att kontakta dig, istället för att använda ditt Ring-ID, som är 40 tecken långt."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -232,13 +232,13 @@ msgid ""
 "devices to your account."
 msgstr "Detta lösenord kommer att användas för att kryptera din kontodata och för att länka nya enheter till ditt konto."
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Bekräfta lösenord"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "Skapar ditt Ring-konto..."
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -249,8 +249,8 @@ msgid "This may take a few minutes."
 msgstr "Detta kan ta några få minuter."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "Hämtar ditt Ring-konto..."
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -262,20 +262,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring-inställningar"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Starta Ring vid systeminloggning"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Visa Ring-ikon i meddelandefältet (systray)."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Ta fram Ring till förgrunden vid inkommande samtal."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -337,7 +337,7 @@ msgstr "Allmänt"
 msgid "Media"
 msgstr "Media"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Inställningar"
 
@@ -407,10 +407,10 @@ msgstr "Lägg till ny enhet"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -421,12 +421,12 @@ msgid "Enter archive password"
 msgstr "Ange arkivlösenord"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Export på Ring"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "Exporterar konto på Ring..."
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -440,7 +440,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "Klicka för att byta lösenord"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Exportera konto"
 
@@ -466,8 +466,8 @@ msgid "Voicemail"
 msgstr "Röstbrevlåda"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Kända enheter, länkade till detta Ring-konto"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -733,19 +733,19 @@ msgstr "Ange markerat som bild"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "Kan inte starta.\nTillse att Ring-tjänsten (dring) körs.\nFel: %s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring-fel"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "Visa Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -792,8 +792,8 @@ msgid "Performing lookup…"
 msgstr "Utför uppslagning..."
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "Ange lösenordet för ditt Ring-konto"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -810,36 +810,36 @@ msgid "Choose download folder"
 msgstr "Välj nerladdningsmapp"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_Avbryt"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "_Spara"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Fel lösenord"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Nätverksfel, försök igen"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Kunde inte starta export till Ring, försök igen"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "Byt lösenord"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Spara fil"
 
@@ -847,13 +847,13 @@ msgstr "Spara fil"
 msgid "File exported to destination: "
 msgstr "Fil exporterad till:"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "Varning! Denna åtgärd kommer att återkalla enheten!\nNotera att åtgärden inte kan ångras."
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "Ange lösenord för att återkalla enheten"
 
@@ -873,11 +873,11 @@ msgstr "Felaktigt lösenord"
 msgid "Save name"
 msgstr "Spara namn"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Återkalla enhet"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "Kunde inte återkalla enheten"
 
@@ -901,35 +901,35 @@ msgstr "Visa lösenord"
 msgid "Voicemail number"
 msgstr "Nummer till röstbrevlåda"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "Fel: Fel lösenord!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "Fel: Okänd enhet!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "Dela _skärmområde"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "Dela _hela skärmen"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "Strömma _fil"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "Visa avancerad information"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Öppna avatarbild"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -947,9 +947,9 @@ msgstr "\"Lev fritt eller dö\"\nkompilerat %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "GNOME-klient för Ring\nRing är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -963,65 +963,65 @@ msgstr "Sluta spela in"
 msgid "Send recorded message"
 msgstr "Skicka inspelat meddelande"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "Lägg till konto..."
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "starta samtal"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "öppna chatt"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Sök i kontakter eller ange nummer"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "Lämna inställningssidan"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "ringer dig!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Inkommande samtal"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "Ny förfrågan från"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "Lita på begäran"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "Nytt meddelande"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring-fel"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "Försöker återansluta till Ring-tjänsten (dring)..."
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Kunde inte återansluta till Ring-demonen (dring).\nRing kommer nu att avslutas."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1074,116 +1074,110 @@ msgid ""
 msgstr "Återställer dold status för huvudfönstret (applicerbart endast på primär instans)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME-klient för Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Lösenorden stämmer inte"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Detta är ditt Ring-användarnamn.\nKopiera och dela det med dina vänner!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Detta är ditt Ring-ID.\nKopiera och dela det med dina vänner!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring är fri mjukvara för universell kommunikation, med respekt för användarens frihet och integritet."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "QR-kod för Ring-ID"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "Varning! Denna åtgärd kommer att ta bort detta konto på denna enhet!\nNotera att åtgärden inte kan ångras och att ditt registrerade användarnamn kan förloras!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Auto"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "Redigera namn"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "Ta bort bannlysning"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "Det nya lösenordet och bekräftelsen är olika"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "Felaktigt lösenord!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "Notera att lösenordet ändras på denna enhet endast."
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "Aktuellt lösenord"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "Konto exporterat!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "Kontoexport misslyckades."
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "Okänt fel"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "Startar..."
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Nerkopplad"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "Ansluter..."
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Uppkopplad"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "Okänd status"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "Lösenord saknas"
diff --git a/po/tr.po b/po/tr.po
index 15da32e3dc8fa70e1ee27aafc5c5b07787a685b7..774f895735677f3615068be978e585d3fc4f0b61 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -12,8 +12,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Turkish (http://www.transifex.com/savoirfairelinux/ring/language/tr/)\n"
 "MIME-Version: 1.0\n"
@@ -58,7 +58,7 @@ msgstr "Hesap göçü"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "Hesabı sil"
 
@@ -141,23 +141,23 @@ msgid "Welcome to"
 msgstr "Hoş Geldiniz"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "Ring Hesabı Oluştur"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "Yeni bir Ring hesabı oluştur (yeni kullanıcılar için)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "Bu aygıtı bir hesaba bağla"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "Bu aygıtları başka aygıtta oluşturulan Ring hesabına bağla"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "İptal"
 
@@ -178,7 +178,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -219,10 +219,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "Bunu seçerek Ring ağı üzerinde benzersiz bir kullanıcı adı kayıt olacaksınız. İnsanlar 40 karakter uzunluğundaki Ring Kimliğiniz yerine bunu kullanarak sizinle iletişime geçebilecek."
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -236,12 +236,12 @@ msgid ""
 "devices to your account."
 msgstr "Bu parola hesap bilgilerinizi şifrelemek ve hesabınızı yeni aygıtlara bağlamak için kullanılacaktır"
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Parolayı onayla"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -253,7 +253,7 @@ msgid "This may take a few minutes."
 msgstr "Bu bir kaç dakika sürebilir."
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -266,20 +266,20 @@ msgid "OK"
 msgstr "TAMAM"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring ayarları"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Ring'i girişte başlat"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "Ring simgesini bildirim bölümünde (systray) göster."
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Gelen aramalarda Ring'i ön plana çıkar."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -341,7 +341,7 @@ msgstr "Genel"
 msgid "Media"
 msgstr "Ortam"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Ayarlar"
 
@@ -411,10 +411,10 @@ msgstr "Yeni Aygıt Ekle"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "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."
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -425,11 +425,11 @@ msgid "Enter archive password"
 msgstr "Arşiv parolası girin"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Ring'de Dışa Aktar"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -444,7 +444,7 @@ msgstr "Kimlik"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "Hesapları dışa aktar"
 
@@ -470,8 +470,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "Bu Ring hesabına bağlı bilinen aygıtlar"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -737,18 +737,18 @@ msgstr "Seçimi görüntü olarak belirle"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring Hatası"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -796,7 +796,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -814,36 +814,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "_İptal"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "Geçersiz parola"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "Ağ hatası, yeniden deneyin"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "Ring dışa aktarımı başlatılamadı, yeniden deneyin"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Dosyayı Kaydet"
 
@@ -851,13 +851,13 @@ msgstr "Dosyayı Kaydet"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -877,11 +877,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "Aygıtı feshet "
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -905,35 +905,35 @@ msgstr "Parolayı göster"
 msgid "Voicemail number"
 msgstr "Sesli ileti numarası"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "İleri bilgileri göster"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Avatar Resmi Aç"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "_Aç"
 
@@ -951,9 +951,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ring için GNOME istemcisi.\nRing; kullanıcılarının özgürlüklerine ve gizliliğine önem veren, evrensel iletişim için özgür yazılımdır."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -967,65 +967,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "ara"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "konuşma aç"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Kişileri ara veya numara gir"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Gelen arama"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring Hatası"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Ring artalan sürecine (dring) yeniden bağlanılamıyor.\nRing şimdi çıkacak."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1078,116 +1078,110 @@ msgid ""
 msgstr "Ana pencerenin gizli durumunu eski haline döndürür (sadece birincil oluşum için geçerli)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Ring için GNOME istemcisi"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "Parolalar uyuşmuyor"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "Bu senin Ring kullanıcı adın.\nKopyala ve arkadaşlarınla paylaş!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Bu senin RingID'in.\nKopyala ve arkadaşlarınla paylaş!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "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."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Kendiliğinden"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Yeni parola"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "Çevrimdışı"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "Çevrimiçi"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 8dd7482983684fd64ba10bdeb961a501272bf468..c7ae5a26184afcc1e912c56e7a9920da7e1084a9 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -14,8 +14,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Ukrainian (http://www.transifex.com/savoirfairelinux/ring/language/uk/)\n"
 "MIME-Version: 1.0\n"
@@ -60,7 +60,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -143,11 +143,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -155,11 +155,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "Відміна"
 
@@ -180,7 +180,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -221,7 +221,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -238,12 +238,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "Підтвердити пароль"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -255,7 +255,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -268,20 +268,20 @@ msgid "OK"
 msgstr "OK"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Налаштування Ring"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "Запускати із системою"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "Відкрити вікно Ring коли надходить вхідний дзвінкок."
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -343,7 +343,7 @@ msgstr "Головні"
 msgid "Media"
 msgstr "Медіа"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "Налаштування"
 
@@ -413,8 +413,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -427,11 +427,11 @@ msgid "Enter archive password"
 msgstr "Введіть пароль архіву"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -446,7 +446,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -472,7 +472,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -739,18 +739,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Помилка Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -798,7 +798,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -816,36 +816,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "Зберегти файл"
 
@@ -853,13 +853,13 @@ msgstr "Зберегти файл"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -879,11 +879,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -907,35 +907,35 @@ msgstr "Відобразити пароль"
 msgid "Voicemail number"
 msgstr "Номер голосової пошти"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "Відкрити зображення Аватару."
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -953,8 +953,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -969,65 +969,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "Пошук контактів чи введіть номер"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "Вхідний дзвінок"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Помилка Ring"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "Не вдається перепідключитись до демону Ring (dring).\nЗараз Ring завершить роботу."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1080,116 +1080,110 @@ msgid ""
 msgstr "Відновлює сховане головне вікно (діє тільки для головної копії запущеної програми)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME клієнт для Ring"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "Це Ваш RingID.\nКопіюйте й поширюйте його серед Ваших друзів!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring - це безкоштовне програмне забезпечення для спілкування, яке поважає свободу та конфіденційність своїх користувачів."
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "Авто"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "Новий пароль"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/zh.po b/po/zh.po
index 07655b87051908b2f81f3823c2bdaed812e2d14f..b0b6086071b80b8e617d851160e7c9fe09c15521 100644
--- a/po/zh.po
+++ b/po/zh.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Chinese (http://www.transifex.com/savoirfairelinux/ring/language/zh/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr ""
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr ""
 
@@ -139,11 +139,11 @@ msgid "Welcome to"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
+msgid "Create Jami Account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
+msgid "Create a new Jami account (for new users)"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:72
@@ -151,11 +151,11 @@ msgid "Link this device to an account"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
+msgid "Link this devices to a Jami account created on another device"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "取消"
 
@@ -176,7 +176,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -217,7 +217,7 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
 msgstr ""
@@ -234,12 +234,12 @@ msgid ""
 "devices to your account."
 msgstr ""
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -251,7 +251,7 @@ msgid "This may take a few minutes."
 msgstr ""
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -264,19 +264,19 @@ msgid "OK"
 msgstr ""
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
+msgid "Jami Settings"
 msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "登入時啟用Ring"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
+msgid "Show Jami icon in the notification area (systray)."
 msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
+msgid "Bring Jami to the foreground on incoming calls."
 msgstr ""
 
 #: ui/generalsettingsview.ui:86
@@ -339,7 +339,7 @@ msgstr "通用"
 msgid "Media"
 msgstr "媒體"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "設定"
 
@@ -409,8 +409,8 @@ msgstr ""
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
 msgstr ""
 
@@ -423,11 +423,11 @@ msgid "Enter archive password"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
+msgid "Export on the Jami"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -442,7 +442,7 @@ msgstr ""
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -468,7 +468,7 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
+msgid "Known devices linked to this Jami account"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
@@ -735,18 +735,18 @@ msgstr ""
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -794,7 +794,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr ""
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "儲存檔案"
 
@@ -849,13 +849,13 @@ msgstr "儲存檔案"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -875,11 +875,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -903,35 +903,35 @@ msgstr "顯示密碼"
 msgid "Voicemail number"
 msgstr "語音留言號"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr ""
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr ""
 
@@ -949,8 +949,8 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
 msgstr ""
 
 #: src/messagingwidget.cpp:223
@@ -965,64 +965,64 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr ""
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "從通訊錄尋找或是輸入號碼"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "來電"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
+msgid "Jami Error"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
 msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr ""
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- GNOME 版 Ring 客戶端"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
 msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "這是你的RingID\n複製並且與你的朋友們分享!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
 msgstr ""
 
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr ""
-
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 0554cbb71cac0821b4966625b1c7ae2f741b39c0..b045b6c0983933707e124ba7ea376f24c53bb46c 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -11,8 +11,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/savoirfairelinux/ring/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -57,7 +57,7 @@ msgstr "迁移帐户"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "删除帐户"
 
@@ -140,23 +140,23 @@ msgid "Welcome to"
 msgstr "欢迎来到"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "创建Ring帐户"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "创建新的Ring帐户(新用户)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "将此设备与一个帐户进行连接"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "将此设备与其他设备创建的Ring帐户进行连接"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "取消"
 
@@ -177,7 +177,7 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
@@ -218,10 +218,10 @@ msgstr ""
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "勾选这项以注册Ring网络用户名。该用户名唯一并可替代40字符的RingID。"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -235,12 +235,12 @@ msgid ""
 "devices to your account."
 msgstr "该密码用于加密您的帐户数据,以及将其他设备与您的帐户进行连接。"
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "确认密码"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
+msgid "Generating your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:588
@@ -252,7 +252,7 @@ msgid "This may take a few minutes."
 msgstr "可能需要数分钟。"
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
+msgid "Retrieving your Jami account…"
 msgstr ""
 
 #: ui/accountcreationwizard.ui:647
@@ -265,20 +265,20 @@ msgid "OK"
 msgstr "确定"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring设置"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "登录时自动启动Ring"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "在系统托盘中显示Ring图标。"
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "来电时将Ring切换到前台。"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -340,7 +340,7 @@ msgstr "通用"
 msgid "Media"
 msgstr "媒体"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "设置"
 
@@ -410,10 +410,10 @@ msgstr "添加新设备"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "要在新设备上添加您的Ring帐户,您需要使用Ring导出该帐户。您会获得一个PIN,并且有5分钟时间将该PIN输入您的新设备。"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -424,11 +424,11 @@ msgid "Enter archive password"
 msgstr "输入档案密码"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "Ring导出"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
+msgid "Exporting account on the Jami…"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
@@ -443,7 +443,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr ""
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr ""
 
@@ -469,8 +469,8 @@ msgid "Voicemail"
 msgstr ""
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "与该Ring帐户连接的已知设备"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -736,18 +736,18 @@ msgstr "设置选区为头像"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
 msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring错误"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
 msgstr ""
 
 #: src/ring_client.cpp:291
@@ -795,7 +795,7 @@ msgid "Performing lookup…"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
+msgid "Enter the password of your Jami account"
 msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
@@ -813,36 +813,36 @@ msgid "Choose download folder"
 msgstr ""
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "密码错误"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "网络错误,请重试"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "无法导出至Ring,请重试"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr ""
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "保存文件"
 
@@ -850,13 +850,13 @@ msgstr "保存文件"
 msgid "File exported to destination: "
 msgstr ""
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr ""
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr ""
 
@@ -876,11 +876,11 @@ msgstr ""
 msgid "Save name"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "吊销设备"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr ""
 
@@ -904,35 +904,35 @@ msgstr "显示密码"
 msgid "Voicemail number"
 msgstr "语音信箱号码"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr ""
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr ""
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr ""
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr ""
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr ""
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "显示高级信息"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "打开头像图片"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -950,9 +950,9 @@ msgstr ""
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ring:GNOME客户端\nRing是自由软件,尊重用户的通讯自由与隐私。"
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -966,65 +966,65 @@ msgstr ""
 msgid "Send recorded message"
 msgstr ""
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr ""
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "拨出"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "发起聊天"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "查找通讯录或输入号码"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr ""
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "来电"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr ""
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr ""
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring错误"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
 msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "无法连接至Ring守护进程(dring)。\nRing将立即退出。"
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1077,116 +1077,110 @@ msgid ""
 msgstr "恢复主窗口的隐藏状态(仅应用于主实例)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Ring的GNOME客户端"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "密码不匹配"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "这是您的Ring用户名。\n复制并发送给您的朋友!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "这是您的RingID。\n复制并发送给您的朋友!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring是自由软件,尊重用户的通讯自由与隐私。"
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
 msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr ""
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr ""
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "自动"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "新密码"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "离线"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "在线"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr ""
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index dfc2e66d142607f904a8639b0556a38f7f678c7c..952bd9692f69ab7133f7ef1e85567374127b525f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -10,8 +10,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Ring\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2018-12-03 03:09-0500\n"
-"PO-Revision-Date: 2018-11-19 08:09+0000\n"
+"POT-Creation-Date: 2018-12-10 03:09-0500\n"
+"PO-Revision-Date: 2018-12-10 08:09+0000\n"
 "Last-Translator: Alexandre Lision\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/savoirfairelinux/ring/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
@@ -56,7 +56,7 @@ msgstr "遷移帳號"
 
 #: ui/accountmigrationview.ui:212 ui/newaccountsettingsview.ui:581
 #: ui/newaccountsettingsview.ui:874 src/accountmigrationview.cpp:177
-#: src/newaccountsettingsview.cpp:963
+#: src/newaccountsettingsview.cpp:965
 msgid "Delete account"
 msgstr "刪除帳號"
 
@@ -139,23 +139,23 @@ msgid "Welcome to"
 msgstr "歡迎來到"
 
 #: ui/accountcreationwizard.ui:64
-msgid "Create Ring Account"
-msgstr "建立 Ring 帳號"
+msgid "Create Jami Account"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:65
-msgid "Create a new Ring account (for new users)"
-msgstr "建立一個新的 Ring 帳號(供新使用者使用)"
+msgid "Create a new Jami account (for new users)"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:72
 msgid "Link this device to an account"
 msgstr "連結這個裝置到一個帳號"
 
 #: ui/accountcreationwizard.ui:73
-msgid "Link this devices to a Ring account created on another device"
-msgstr "連結此裝置到一個在其他裝置上建立的 Ring 帳號"
+msgid "Link this devices to a Jami account created on another device"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:80 ui/newaccountsettingsview.ui:183
-#: src/newaccountsettingsview.cpp:883
+#: src/newaccountsettingsview.cpp:885
 msgid "Cancel"
 msgstr "取消"
 
@@ -176,11 +176,11 @@ msgid ""
 "To link this device to another account, you have two possibilities. You can "
 "import your account from the DHT, but first, you need to obtain a PIN code. "
 "To generate the PIN code, go to the account management setting of a previous"
-" device, choose the Ring Account to use and select \"Link another device to "
+" device, choose the Jami Account to use and select \"Link another device to "
 "this account\". You will get the necessary PIN to complete this form. The "
 "PIN is only valid for 10 minutes. Or, you can directly import your account "
 "from an archive."
-msgstr "要連結此裝置到其他帳號,您有兩個選擇。您可以從 DHT 匯入您的帳號,但首先您需要取得 PIN 碼。要生成 PIN 碼,到先前裝置的帳號管理設定,選擇 Ring 帳號來使用並選取「連結其他裝置到這個帳號」。您將會得到需要 PIN 碼來完成這份表單。PIN 僅在 10 分鐘內有效。或是您也可以從封存檔直接匯入您的帳號。"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:162
 msgid "Enter your pin:"
@@ -217,10 +217,10 @@ msgstr "註冊使用者名稱"
 
 #: ui/accountcreationwizard.ui:388
 msgid ""
-"By checking this, you will register a unique username on the Ring network. "
+"By checking this, you will register a unique username on the Jami network. "
 "People can use it to contact you instead of using your RingID, which is 40 "
 "characters long."
-msgstr "透過勾選這個,您將會在 Ring 網路上註冊一個獨一無二的使用者名稱。人們可以使用它來聯絡您,而不必使用長達 40 個字元的您的 RingID。"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:424 ui/newaccountsettingsview.ui:503
 #: ui/newaccountsettingsview.ui:733 src/accountgeneraltab.cpp:669
@@ -234,13 +234,13 @@ msgid ""
 "devices to your account."
 msgstr "這個密碼將會用於加密您的帳號資料與連結新的裝置到您的帳號。"
 
-#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:873
+#: ui/accountcreationwizard.ui:491 src/newaccountsettingsview.cpp:875
 msgid "Confirm password"
 msgstr "確認密碼"
 
 #: ui/accountcreationwizard.ui:562
-msgid "Generating your Ring account…"
-msgstr "正在生成您的 Ring 帳號……"
+msgid "Generating your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:588
 msgid "Registering username…"
@@ -251,8 +251,8 @@ msgid "This may take a few minutes."
 msgstr "這將會耗費數分鐘。"
 
 #: ui/accountcreationwizard.ui:621
-msgid "Retrieving your Ring account…"
-msgstr "正在擷取您的 Ring 帳號……"
+msgid "Retrieving your Jami account…"
+msgstr ""
 
 #: ui/accountcreationwizard.ui:647
 msgid "Error creating/loading account."
@@ -264,20 +264,20 @@ msgid "OK"
 msgstr "確定"
 
 #: ui/generalsettingsview.ui:46
-msgid "Ring Settings"
-msgstr "Ring 設定"
+msgid "Jami Settings"
+msgstr ""
 
 #: ui/generalsettingsview.ui:62
-msgid "Start Ring on login"
-msgstr "登入時啟動 Ring"
+msgid "Start Jami on login"
+msgstr ""
 
 #: ui/generalsettingsview.ui:70
-msgid "Show Ring icon in the notification area (systray)."
-msgstr "在通知區域(系統匣)中顯示 Ring 圖示。"
+msgid "Show Jami icon in the notification area (systray)."
+msgstr ""
 
 #: ui/generalsettingsview.ui:78
-msgid "Bring Ring to the foreground on incoming calls."
-msgstr "有來電時將 Ring 帶到前景。"
+msgid "Bring Jami to the foreground on incoming calls."
+msgstr ""
 
 #: ui/generalsettingsview.ui:86
 msgid "Enable notifications for incoming calls."
@@ -339,7 +339,7 @@ msgstr "一般"
 msgid "Media"
 msgstr "媒體"
 
-#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1522
+#: ui/ringmainwindow.ui:145 src/ringmainwindow.cpp:1526
 msgid "Settings"
 msgstr "設定"
 
@@ -409,10 +409,10 @@ msgstr "新增新裝置"
 
 #: ui/newaccountsettingsview.ui:146
 msgid ""
-"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 "
+"To add a new device to your Jami account, you export your account on the "
+"Jami. This will generate a pin that must be entered on your new device "
 "within 5 minutes of its generation."
-msgstr "要新增新裝置到您的 Ring 帳號,您要先在 Ring 上匯出您的帳號。這將會生成 PIN 碼,必須在生成後的 5 分鐘內輸入到您的新裝置上。"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:155
 msgid "Password (required):"
@@ -423,12 +423,12 @@ msgid "Enter archive password"
 msgstr "輸入檔案密碼"
 
 #: ui/newaccountsettingsview.ui:189
-msgid "Export on the Ring"
-msgstr "在 Ring 上匯出"
+msgid "Export on the Jami"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:210
-msgid "Exporting account on the Ring…"
-msgstr "正在匯出 Ring 上的帳號……"
+msgid "Exporting account on the Jami…"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:235
 msgid "Your generated pin:"
@@ -442,7 +442,7 @@ msgstr "ID"
 msgid "Click to change password"
 msgstr "點選以變更密碼"
 
-#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1997
+#: ui/newaccountsettingsview.ui:566 src/newaccountsettingsview.cpp:1999
 msgid "Export account"
 msgstr "匯出帳號"
 
@@ -468,8 +468,8 @@ msgid "Voicemail"
 msgstr "語音信箱"
 
 #: ui/newaccountsettingsview.ui:952
-msgid "Known devices linked to this Ring account"
-msgstr "連結到這個 Ring 帳號的已知裝置"
+msgid "Known devices linked to this Jami account"
+msgstr ""
 
 #: ui/newaccountsettingsview.ui:960
 msgid "Link another device"
@@ -735,19 +735,19 @@ msgstr "設定選擇為圖片"
 #, c-format
 msgid ""
 "Unable to initialize.\n"
-"Make sure the Ring daemon (dring) is running.\n"
+"Make sure the Jami daemon (dring) is running.\n"
 "Error: %s"
-msgstr "無法初始化。\n請確定 Ring 幕後程式 (dring) 正在執行。\n錯誤:%s"
+msgstr ""
 
 #: src/ring_client.cpp:144
-msgid "Ring Error"
-msgstr "Ring 錯誤"
+msgid "Jami Error"
+msgstr ""
 
 #: src/ring_client.cpp:287
 msgctxt ""
-"In the status icon menu, toggle action to show or hide the Ring main window"
-msgid "Show Ring"
-msgstr "顯示 Ring"
+"In the status icon menu, toggle action to show or hide the Jami main window"
+msgid "Show Jami"
+msgstr ""
 
 #: src/ring_client.cpp:291
 msgid "Quit"
@@ -794,8 +794,8 @@ msgid "Performing lookup…"
 msgstr "正在執行查詢……"
 
 #: src/usernameregistrationbox.cpp:313
-msgid "Enter the password of your Ring account"
-msgstr "輸入您 Ring 帳號的密碼"
+msgid "Enter the password of your Jami account"
+msgstr ""
 
 #: src/usernameregistrationbox.cpp:344
 msgid "Registration in progress…"
@@ -812,36 +812,36 @@ msgid "Choose download folder"
 msgstr "選擇下載資料夾"
 
 #: src/generalsettingsview.cpp:180 src/accountgeneraltab.cpp:342
-#: src/avatarmanipulation.cpp:406 src/chatview.cpp:178
-#: src/newaccountsettingsview.cpp:926
+#: src/avatarmanipulation.cpp:415 src/chatview.cpp:178
+#: src/newaccountsettingsview.cpp:928
 msgid "_Cancel"
 msgstr "取消(_C)"
 
 #: src/generalsettingsview.cpp:182 src/accountgeneraltab.cpp:344
-#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:928
+#: src/chatview.cpp:180 src/newaccountsettingsview.cpp:930
 msgid "_Save"
 msgstr "儲存(_S)"
 
-#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1705
+#: src/accountgeneraltab.cpp:239 src/newaccountsettingsview.cpp:1707
 msgid "Bad password"
 msgstr "密碼錯誤"
 
-#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1711
+#: src/accountgeneraltab.cpp:245 src/newaccountsettingsview.cpp:1713
 msgid "Network error, try again"
 msgstr "網路錯誤,請重試"
 
-#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1729
-msgid "Could not initiate export to the Ring, try again"
-msgstr "無法啟用輸出到 Ring,請重試。"
+#: src/accountgeneraltab.cpp:257 src/newaccountsettingsview.cpp:1731
+msgid "Could not initiate export to the Jami, try again"
+msgstr ""
 
 #: src/accountgeneraltab.cpp:325 src/accountgeneraltab.cpp:528
-#: src/newaccountsettingsview.cpp:797 src/newaccountsettingsview.cpp:820
-#: src/newaccountsettingsview.cpp:844 src/newaccountsettingsview.cpp:880
+#: src/newaccountsettingsview.cpp:799 src/newaccountsettingsview.cpp:822
+#: src/newaccountsettingsview.cpp:846 src/newaccountsettingsview.cpp:882
 msgid "Change password"
 msgstr "變更密碼"
 
 #: src/accountgeneraltab.cpp:339 src/chatview.cpp:175
-#: src/newaccountsettingsview.cpp:923
+#: src/newaccountsettingsview.cpp:925
 msgid "Save File"
 msgstr "儲存檔案"
 
@@ -849,13 +849,13 @@ msgstr "儲存檔案"
 msgid "File exported to destination: "
 msgstr "檔案已匯出至目標位置"
 
-#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:620
+#: src/accountgeneraltab.cpp:477 src/newaccountsettingsview.cpp:622
 msgid ""
 "Warning! This action will revoke the device!\n"
 "Note: this action cannot be undone."
 msgstr "警告!這個動作將會撤銷裝置!\n注意:這個動作無法復原。"
 
-#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:621
+#: src/accountgeneraltab.cpp:478 src/newaccountsettingsview.cpp:623
 msgid "Enter password to revoke device"
 msgstr "輸入密碼以撤銷裝置"
 
@@ -875,11 +875,11 @@ msgstr "不正確的密碼"
 msgid "Save name"
 msgstr "儲存名稱"
 
-#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:679
+#: src/accountgeneraltab.cpp:560 src/newaccountsettingsview.cpp:681
 msgid "Revoke device"
 msgstr "撤銷裝置"
 
-#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:701
+#: src/accountgeneraltab.cpp:581 src/newaccountsettingsview.cpp:703
 msgid "Error when revoking device"
 msgstr "當撤銷裝置時發生錯誤"
 
@@ -903,35 +903,35 @@ msgstr "顯示密碼"
 msgid "Voicemail number"
 msgstr "語音郵件號碼"
 
-#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1788
+#: src/accountgeneraltab.cpp:799 src/newaccountsettingsview.cpp:1790
 msgid "Error: wrong password!"
 msgstr "錯誤:不正確的密碼!"
 
-#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1791
+#: src/accountgeneraltab.cpp:802 src/newaccountsettingsview.cpp:1793
 msgid "Error: unknown device!"
 msgstr "錯誤:未知的裝置!"
 
-#: src/video/video_widget.cpp:583
+#: src/video/video_widget.cpp:547
 msgid "Share _screen area"
 msgstr "分享螢幕區域(_S)"
 
-#: src/video/video_widget.cpp:594
+#: src/video/video_widget.cpp:555
 msgid "Share _monitor"
 msgstr "分享螢幕(_M)"
 
-#: src/video/video_widget.cpp:605
+#: src/video/video_widget.cpp:562
 msgid "Stream _file"
 msgstr "串流檔案(_F)"
 
-#: src/video/video_widget.cpp:618
+#: src/video/video_widget.cpp:572
 msgid "Show advanced information"
 msgstr "顯示進階資訊"
 
-#: src/avatarmanipulation.cpp:403
+#: src/avatarmanipulation.cpp:412
 msgid "Open Avatar Image"
 msgstr "開啟大頭貼圖片"
 
-#: src/avatarmanipulation.cpp:408 src/chatview.cpp:180
+#: src/avatarmanipulation.cpp:417 src/chatview.cpp:180
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -949,9 +949,9 @@ msgstr "\"Live Free or Die\"\n構建於 %.25s"
 
 #: src/dialogs.c:137
 msgid ""
-"The GNOME client for Ring.\n"
-"Ring is free software for universal communication which respects the freedoms and privacy of its users."
-msgstr "Ring 的 GNOME 客戶端。\nRing 是一套通用通訊的自由軟體,其尊重使用者的自由與隱私。"
+"The GNOME client for Jami.\n"
+"Jami is free software for universal communication which respects the freedoms and privacy of its users."
+msgstr ""
 
 #: src/messagingwidget.cpp:223
 msgid "Contact appears to be busy. Leave a message ?"
@@ -965,65 +965,65 @@ msgstr "停止錄製"
 msgid "Send recorded message"
 msgstr "傳送已錄製的訊息"
 
-#: src/ringmainwindow.cpp:175
+#: src/ringmainwindow.cpp:176
 msgid "Add account…"
 msgstr "新增帳號……"
 
-#: src/ringmainwindow.cpp:632
+#: src/ringmainwindow.cpp:633
 msgctxt "button next to search entry will place a new call"
 msgid "place call"
 msgstr "開始通話"
 
-#: src/ringmainwindow.cpp:635
+#: src/ringmainwindow.cpp:636
 msgctxt "button next to search entry will open chat"
 msgid "open chat"
 msgstr "開啟聊天"
 
-#: src/ringmainwindow.cpp:1062
+#: src/ringmainwindow.cpp:1064
 msgctxt ""
 "Please try to make the translation 50 chars or less so that it fits into the"
 " layout"
 msgid "Search contacts or enter number"
 msgstr "搜尋聯絡人或輸入號碼"
 
-#: src/ringmainwindow.cpp:1495
+#: src/ringmainwindow.cpp:1499
 msgid "Leave settings page"
 msgstr "離開設定頁面"
 
-#: src/ringmainwindow.cpp:1864
+#: src/ringmainwindow.cpp:1868
 msgid " is calling you!"
 msgstr "正在與您通話!"
 
-#: src/ringmainwindow.cpp:1865
+#: src/ringmainwindow.cpp:1869
 msgid "Incoming call"
 msgstr "來電"
 
-#: src/ringmainwindow.cpp:2007
+#: src/ringmainwindow.cpp:2011
 msgid "New request from "
 msgstr "新請求從"
 
-#: src/ringmainwindow.cpp:2008
+#: src/ringmainwindow.cpp:2012
 msgid "Trust request"
 msgstr "信任請求"
 
-#: src/ringmainwindow.cpp:2065
+#: src/ringmainwindow.cpp:2069
 msgid "New message"
 msgstr "新訊息"
 
 #: src/native/dbuserrorhandler.cpp:36 src/native/dbuserrorhandler.cpp:95
 msgctxt "Name of error window (dialog)"
-msgid "Ring Error"
-msgstr "Ring 錯誤"
+msgid "Jami Error"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:57
-msgid "Trying to reconnect to the Ring daemon (dring)…"
-msgstr "正在嘗試重新連線到 Ring 幕後程式 (dring)……"
+msgid "Trying to reconnect to the Jami daemon (dring)…"
+msgstr ""
 
 #: src/native/dbuserrorhandler.cpp:87
 msgid ""
-"Could not re-connect to the Ring daemon (dring).\n"
-"Ring will now quit."
-msgstr "無法重新連線到 Ring 幕後程式 (dring)。\nRing 將會結束。"
+"Could not re-connect to the Jami daemon (dring).\n"
+"Jami will now quit."
+msgstr ""
 
 #: src/conversationpopupmenu.cpp:214
 msgid "Place _video call"
@@ -1076,116 +1076,110 @@ msgid ""
 msgstr "還原主視窗的隱藏狀態(只適用於主程序)"
 
 #: src/ring_client_options.c:85
-msgid "- GNOME client for Ring"
-msgstr "- Ring 的 GNOME 用戶端"
+msgid "- GNOME client for Jami"
+msgstr ""
 
-#: src/accountcreationwizard.cpp:346
+#: src/accountcreationwizard.cpp:348
 msgid "Passwords don't match"
 msgstr "密碼不相符"
 
-#: src/ringwelcomeview.cpp:85
+#: src/ringwelcomeview.cpp:87
 msgid ""
-"This is your Ring username.\n"
+"This is your Jami username.\n"
 "Copy and share it with your friends!"
-msgstr "這是你的 Ring 使用者名稱。\n複製並與你的朋友分享!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:93
-msgctxt "Do not translate \"RingID\""
+#: src/ringwelcomeview.cpp:95
 msgid ""
-"This is your RingID.\n"
+"This is your ID.\n"
 "Copy and share it with your friends!"
-msgstr "這是你的 RingID.\n複製並與你的朋友分享!"
+msgstr ""
 
-#: src/ringwelcomeview.cpp:150
+#: src/ringwelcomeview.cpp:153
 msgid ""
-"Ring is free software for universal communication which respects the "
+"Jami is free software for universal communication which respects the "
 "freedoms and privacy of its users."
-msgstr "Ring 是一套通用通訊的自由軟體,其尊重使用者的自由與隱私。"
-
-#: src/ringwelcomeview.cpp:204
-msgctxt "Do not translate \"RingID\""
-msgid "RingID QR code"
-msgstr "RingID QR code"
+msgstr ""
 
 #: src/chatview.cpp:175
 msgid "Send File"
 msgstr "傳送檔案"
 
-#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:962
+#: src/accountmigrationview.cpp:176 src/newaccountsettingsview.cpp:964
 msgid ""
 "Warning! This action will remove this account on this device!\n"
 "Note: this action cannot be undone. Also, your registered name can be lost!"
 msgstr "警告!此動作將會在此裝置上移除此帳號!\n注意:此動作無法復原。同時,您已註冊的名稱也將會遺失!"
 
-#: src/currentcallview.cpp:935
+#: src/currentcallview.cpp:977
 msgctxt "Enable automatic video quality"
 msgid "Auto"
 msgstr "自動"
 
-#: src/newaccountsettingsview.cpp:679
+#: src/newaccountsettingsview.cpp:681
 msgid "Edit name"
 msgstr "編輯名稱"
 
-#: src/newaccountsettingsview.cpp:774
+#: src/newaccountsettingsview.cpp:776
 msgid "Unban"
 msgstr "取消阻擋"
 
-#: src/newaccountsettingsview.cpp:810
+#: src/newaccountsettingsview.cpp:812
 msgid "New password and its confirmation are different!"
 msgstr "新密碼與其確認密碼不相符!"
 
-#: src/newaccountsettingsview.cpp:821
+#: src/newaccountsettingsview.cpp:823
 msgid "Incorrect password!"
 msgstr "不正確的密碼!"
 
-#: src/newaccountsettingsview.cpp:858
+#: src/newaccountsettingsview.cpp:860
 msgid "Note: this will change the password only on this device."
 msgstr "注意:這將會僅會在此裝置上變更密碼。"
 
-#: src/newaccountsettingsview.cpp:861
+#: src/newaccountsettingsview.cpp:863
 msgid "Current password"
 msgstr "目前的密碼"
 
-#: src/newaccountsettingsview.cpp:867
+#: src/newaccountsettingsview.cpp:869
 msgid "New password"
 msgstr "新密碼"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Account exported!"
 msgstr "帳號已匯出!"
 
-#: src/newaccountsettingsview.cpp:947
+#: src/newaccountsettingsview.cpp:949
 msgid "Export account failure."
 msgstr "匯出帳號失敗。"
 
-#: src/newaccountsettingsview.cpp:1717
+#: src/newaccountsettingsview.cpp:1719
 msgid "Unknown error"
 msgstr "未知的錯誤"
 
-#: src/newaccountsettingsview.cpp:1962
+#: src/newaccountsettingsview.cpp:1964
 msgid "Initializing…"
 msgstr "正在初始化……"
 
-#: src/newaccountsettingsview.cpp:1965
+#: src/newaccountsettingsview.cpp:1967
 msgid "Offline"
 msgstr "離線"
 
-#: src/newaccountsettingsview.cpp:1968
+#: src/newaccountsettingsview.cpp:1970
 msgid "Connecting…"
 msgstr "正在連線……"
 
-#: src/newaccountsettingsview.cpp:1971
+#: src/newaccountsettingsview.cpp:1973
 msgid "Online"
 msgstr "線上"
 
-#: src/newaccountsettingsview.cpp:1975
+#: src/newaccountsettingsview.cpp:1977
 msgid "Unknown status"
 msgstr "未知狀態"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "••••••••"
 msgstr "••••••••"
 
-#: src/newaccountsettingsview.cpp:2008
+#: src/newaccountsettingsview.cpp:2010
 msgid "no password set"
 msgstr "未設定密碼"